diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 35a84a4..084fa29 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -674,37 +674,26 @@ jobs: sudo -E python3 patch.py netinstall netinstall-cli sudo tar -czvf netinstall-$LATEST_VERSION.tar.gz ./netinstall-cli - - name: Upload Files - if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true' + - name: Setup AWS CLI (for R2) + uses: aws-actions/configure-aws-credentials@v5 + with: + aws-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }} + aws-region: auto + role-session-name: GitHubActionsR2 + + - name: Upload to R2 Bucket run: | sudo mkdir -p ./publish/$LATEST_VERSION sudo cp CHANGELOG ./publish/$LATEST_VERSION/ sudo cp ./all_packages/*.npk ./publish/$LATEST_VERSION/ - sudo chown -R root:root ./publish/ - - LOCAL_PATH=./publish/$LATEST_VERSION - REMOTE_PATH=${{ secrets.SSH_DIRECTORY }} - SERVER=${{ secrets.SSH_SERVER }} - USER=${{ secrets.SSH_USERNAME }} - PASS=${{ secrets.SSH_PASSWORD }} - PORT=${{ secrets.SSH_PORT }} - CHANNEL=${{ matrix.channel }} - - sudo apt-get install -y lftp ssh sshpass > /dev/null 2>&1 - - sudo -E lftp -u "$USER","$PASS" sftp://$SERVER:$PORT </dev/null || true + sudo cp chr-${{ env.LATEST_VERSION }}*.zip ./publish/$LATEST_VERSION/ 2>/dev/null || true + sudo cp netinstall-${{ env.LATEST_VERSION }}.* ./publish/$LATEST_VERSION/ 2>/dev/null || true + sudo cp install-image-${{ env.LATEST_VERSION }}.zip ./publish/$LATEST_VERSION/ 2>/dev/null || true + echo $LATEST_VERSION $BUILD_TIME | sudo tee ./publish/NEWESTa7.$CHANNEL + aws s3 cp ./publish/ s3://routeros/ --recursive --endpoint-url ${{ secrets.R2_ENDPOINT_URL }} + - name: Clear Cloudflare cache if: steps.get_latest.outputs.has_new_version == 'true' && env.RELEASE == 'true'