diff --git a/.github/workflows/build_backend.yml b/.github/workflows/build_backend.yml index c25ec56822654..56dc055f5350c 100644 --- a/.github/workflows/build_backend.yml +++ b/.github/workflows/build_backend.yml @@ -86,7 +86,17 @@ jobs: run: | bash ./buildscripts/ci/backend/package.sh - - name: Build Docker + - name: Send package to S3 + if: env.DO_PUBLISH == 'true' + run: | + bash ./buildscripts/ci/backend/publish_to_s3.sh \ + --s3_key ${{ secrets.S3_KEY_CONVERTER }} \ + --s3_secret ${{ secrets.S3_SECRET_CONVERTER }} \ + --stage ${{ inputs.build_mode }} \ + --mu_version ${{ env.VERSION }} \ + --mu_version_major_minor ${{ env.VERSION_MAJOR_MINOR }} + + - name: Build Docker (used package from S3) if: env.DO_PUBLISH == 'true' run: | bash ./buildscripts/ci/backend/build_docker.sh @@ -99,16 +109,7 @@ jobs: - name: Deploy to musescore.com if: env.DO_PUBLISH == 'true' run: | - bash ./buildscripts/ci/backend/publish_to_s3.sh \ - --s3_key ${{ secrets.S3_KEY_CONVERTER }} \ - --s3_secret ${{ secrets.S3_SECRET_CONVERTER }} \ - --stage ${{ inputs.build_mode }} \ - --mu_version ${{ env.VERSION }} \ - --mu_version_major_minor ${{ env.VERSION_MAJOR_MINOR }} - - pip install jenkinsapi - python3 ./buildscripts/ci/backend/deploy.py --mu_version ${{ env.VERSION }} --api_token ${{ secrets.JENKINS_API_TOKEN }} - name: Upload artifacts on GitHub diff --git a/buildscripts/ci/backend/docker/install_mu_template.sh b/buildscripts/ci/backend/docker/install_mu_template.sh index ca158648d04e2..be821fcd84a6b 100644 --- a/buildscripts/ci/backend/docker/install_mu_template.sh +++ b/buildscripts/ci/backend/docker/install_mu_template.sh @@ -8,7 +8,7 @@ mkdir -p $MU_DIR echo "=== Install MuseScore ${MU_VERSION} ===" MU_DISTRO=MuseScore-${MU_VERSION} -wget -q --show-progress -O $MU_DIR/$MU_DISTRO.7z "$S3_URL/$MU_DISTRO.7z" +wget --show-progress -O $MU_DIR/$MU_DISTRO.7z "$S3_URL/$MU_DISTRO.7z" 7z x -y $MU_DIR/$MU_DISTRO.7z -o"$MU_DIR/" $MU_DIR/convertor -v