diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 5bf7d60..0f5d40f 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -10,6 +10,8 @@ permissions: contents: write env: + + CUSTOM_LICENSE_PRIVATE_KEY: ${{ secrets.CUSTOM_LICENSE_PRIVATE_KEY }} CUSTOM_LICENSE_PUBLIC_KEY: ${{ secrets.CUSTOM_LICENSE_PUBLIC_KEY }} CUSTOM_NPK_SIGN_PRIVATE_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PRIVATE_KEY }} @@ -45,7 +47,7 @@ jobs: arch: [x86,arm64] channel: [stable, testing] env: - TZ: 'Asia/Shanghai' + TZ: 'America/Caracas' LATEST_VERSION: "" ARCH: "" @@ -65,7 +67,7 @@ jobs: LATEST_VERSION=$(wget -nv -O - https://${{ env.MIKRO_UPGRADE_URL }}/routeros/NEWESTa7.${{ matrix.channel }} | cut -d ' ' -f1) echo Latest Version:$LATEST_VERSION if [ "${{ github.event_name }}" == "schedule" ]; then - _LATEST_VERSION=$(wget -nv -O - https://${{ env.CUSTOM_UPGRADE_URL }}/routeros/NEWESTa7.${{ matrix.channel }} | cut -d ' ' -f1) + _LATEST_VERSION=$(wget -nv -O - https://${{ env.CUSTOM_UPGRADE_URL }}/${{ env.SSH_DIRECTORY }}/NEWESTa7.${{ matrix.channel }} | cut -d ' ' -f1) if [ "$_LATEST_VERSION" == "$LATEST_VERSION" ]; then echo "No new version found" echo "has_new_version=false" >> $GITHUB_OUTPUT @@ -383,12 +385,12 @@ jobs: echo $LATEST_VERSION $BUILD_TIME | sudo tee ./publish/NEWESTa7.${{ matrix.channel }} sudo cp CHANGELOG ./publish/$LATEST_VERSION/ sudo cp ./all_packages/*.npk ./publish/$LATEST_VERSION/ - sudo chown -R root:root ./publish/ + #sudo chown -R root:root ./publish/ sudo apt-get install -y lftp > /dev/null 2>&1 - sudo -E lftp -u ${{ secrets.SSH_USERNAME }},'${{ secrets.SSH_PASSWORD }}' sftp://${{ secrets.SSH_SERVER }}:${{ secrets.SSH_PORT }} <