From b8d5fdcc19d1a5f35e1f998c16ff6379d484ead3 Mon Sep 17 00:00:00 2001 From: puntoazul Date: Tue, 26 Nov 2024 12:55:44 -0400 Subject: [PATCH 1/6] Update mikrotik_patch_7.yml Signed-off-by: puntoazul --- .github/workflows/mikrotik_patch_7.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 5bf7d60..93a26ee 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -65,7 +65,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 +383,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 }} < Date: Tue, 26 Nov 2024 12:56:07 -0400 Subject: [PATCH 2/6] Update mikrotik_patch_7.yml Signed-off-by: puntoazul --- .github/workflows/mikrotik_patch_7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 93a26ee..db4e9b7 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -387,7 +387,7 @@ jobs: sudo apt-get install -y lftp > /dev/null 2>&1 sudo -E lftp -u ${{ secrets.SSH_USERNAME }},'${{ secrets.SSH_PASSWORD }}' ftp://${{ secrets.SSH_SERVER }}:${{ secrets.SSH_PORT }} < Date: Tue, 26 Nov 2024 14:24:29 -0400 Subject: [PATCH 3/6] Update mikrotik_patch_7.yml Signed-off-by: puntoazul --- .github/workflows/mikrotik_patch_7.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index db4e9b7..04fe207 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -45,13 +45,13 @@ jobs: arch: [x86,arm64] channel: [stable, testing] env: - TZ: 'Asia/Shanghai' + TZ: 'America/Caracas' LATEST_VERSION: "" ARCH: "" steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Python uses: actions/setup-python@v5 From 5d3570394bfe431c98d76113bfbeccaec655f407 Mon Sep 17 00:00:00 2001 From: puntoazul Date: Tue, 26 Nov 2024 14:27:18 -0400 Subject: [PATCH 4/6] Update mikrotik_patch_7.yml Signed-off-by: puntoazul --- .github/workflows/mikrotik_patch_7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 04fe207..935d03d 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -51,7 +51,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v5 + uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 From 399cb35310acba656f047c3dbd3b9187f537e545 Mon Sep 17 00:00:00 2001 From: puntoazul Date: Tue, 26 Nov 2024 15:49:50 -0400 Subject: [PATCH 5/6] Update mikrotik_patch_7.yml Signed-off-by: puntoazul --- .github/workflows/mikrotik_patch_7.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 935d03d..4461a1c 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -10,13 +10,23 @@ 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 }} - CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }} + + + CUSTOM_NPK_SIGN_PRIVATE_KEY : 2CA749292F375A9CF1F164AF01C4E1A76AFFA4E2466DE358BA9E90D065C70A4F + CUSTOM_NPK_SIGN_PUBLIC_KEY : 664158356E7DDE2D9D8B47EF868D856D6053122CF2CB733B4BE92B9148A9E06B + CUSTOM_LICENSE_PRIVATE_KEY : 2FA9EB91619E6AB489E9B3DA2E8F2929C71523F4B6D52D51367DDB4184556C09 + CUSTOM_LICENSE_PUBLIC_KEY : 322BCACF97A0201D18FC89FDF5F765CED8B8FA59B3F49516591307D66A154A75 + MIKRO_LICENSE_PUBLIC_KEY : 8E1067E4305FCDC0CFBF95C10F96E5DFE8C49AEF486BD1A4E2E96C27F01E3E32 + MIKRO_NPK_SIGN_PUBLIC_LKEY : C293CED638A2A33C681FC8DE98EE26C54EADC5390C2DFCE197D35C83C416CF59 + + + #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 }} + #CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }} CUSTOM_CLOUD_PUBLIC_KEY: ${{ secrets.CUSTOM_CLOUD_PUBLIC_KEY }} - MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} - MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }} + #MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} + #MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }} MIKRO_CLOUD_PUBLIC_KEY: ${{ secrets.MIKRO_CLOUD_PUBLIC_KEY }} MIKRO_LICENCE_URL: ${{ secrets.MIKRO_LICENCE_URL }} CUSTOM_LICENCE_URL: ${{ secrets.CUSTOM_LICENCE_URL }} From 995bf7ce056d439ca7f8de425254dcd173fa92d5 Mon Sep 17 00:00:00 2001 From: puntoazul Date: Tue, 26 Nov 2024 15:52:27 -0400 Subject: [PATCH 6/6] Update mikrotik_patch_7.yml Signed-off-by: puntoazul --- .github/workflows/mikrotik_patch_7.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 4461a1c..0f5d40f 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -12,21 +12,13 @@ permissions: env: - CUSTOM_NPK_SIGN_PRIVATE_KEY : 2CA749292F375A9CF1F164AF01C4E1A76AFFA4E2466DE358BA9E90D065C70A4F - CUSTOM_NPK_SIGN_PUBLIC_KEY : 664158356E7DDE2D9D8B47EF868D856D6053122CF2CB733B4BE92B9148A9E06B - CUSTOM_LICENSE_PRIVATE_KEY : 2FA9EB91619E6AB489E9B3DA2E8F2929C71523F4B6D52D51367DDB4184556C09 - CUSTOM_LICENSE_PUBLIC_KEY : 322BCACF97A0201D18FC89FDF5F765CED8B8FA59B3F49516591307D66A154A75 - MIKRO_LICENSE_PUBLIC_KEY : 8E1067E4305FCDC0CFBF95C10F96E5DFE8C49AEF486BD1A4E2E96C27F01E3E32 - MIKRO_NPK_SIGN_PUBLIC_LKEY : C293CED638A2A33C681FC8DE98EE26C54EADC5390C2DFCE197D35C83C416CF59 - - - #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 }} - #CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }} + 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 }} + CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }} CUSTOM_CLOUD_PUBLIC_KEY: ${{ secrets.CUSTOM_CLOUD_PUBLIC_KEY }} - #MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} - #MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }} + MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} + MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }} MIKRO_CLOUD_PUBLIC_KEY: ${{ secrets.MIKRO_CLOUD_PUBLIC_KEY }} MIKRO_LICENCE_URL: ${{ secrets.MIKRO_LICENCE_URL }} CUSTOM_LICENCE_URL: ${{ secrets.CUSTOM_LICENCE_URL }}