From cd86c556a9eb147c9b48f5498497a884d2231604 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mauro-balades@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:30:05 +0100 Subject: [PATCH 1/4] Install `aria2c` for release builds Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com> --- .github/workflows/windows-release-build.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index dc272640b..4622f4de0 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -90,11 +90,6 @@ jobs: set -x mkdir -p ~/win-cross cd engine/ - echo Setup wine - aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst - tar --zstd -xvf wine.tar.zst -C ~/win-cross - rm wine.tar.zst - echo Setup Visual Studio sudo apt-get update sudo apt-get install -y python3-pip autoconf \ autoconf2.13 \ @@ -135,7 +130,13 @@ jobs: uuid-dev \ wget \ zip \ - zlib1g-dev + zlib1g-dev \ + aria2c + echo Setup wine + aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst + tar --zstd -xvf wine.tar.zst -C ~/win-cross + rm wine.tar.zst + echo Setup Visual Studio ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022 - name: Bootstrap From c0d64f91c080f13d418c5730aba5b439698e76b8 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mauro-balades@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:33:45 +0100 Subject: [PATCH 2/4] Update build.yml Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44a9bca99..068adae24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -436,12 +436,12 @@ jobs: sudo ./aws/install --update - name: Stop self-hosted runner - if: ${{ inputs.create_release && inputs.update_branch == 'release' }} + if: always() run: | echo "Stopping self-hosted runner" echo "${{ secrets.SELF_HOSTED_RUNNER_STOP_SCRIPT }}" > stop.sh sudo chmod +x stop.sh - ./stop.sh > /dev/null 2>&1 & + ./stop.sh - name: Remove self-hosted runner script if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }} From 7b90548f88fa329256f75083a2850562ae65b397 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mauro-balades@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:36:01 +0100 Subject: [PATCH 3/4] Fixed stoping self-hosted release runners Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 068adae24..44a9bca99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -436,12 +436,12 @@ jobs: sudo ./aws/install --update - name: Stop self-hosted runner - if: always() + if: ${{ inputs.create_release && inputs.update_branch == 'release' }} run: | echo "Stopping self-hosted runner" echo "${{ secrets.SELF_HOSTED_RUNNER_STOP_SCRIPT }}" > stop.sh sudo chmod +x stop.sh - ./stop.sh + ./stop.sh > /dev/null 2>&1 & - name: Remove self-hosted runner script if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }} From 92fc0f404454fe2186a51268c5d474d576d85025 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mauro-balades@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:39:26 +0100 Subject: [PATCH 4/4] Fixed installing `aria2` Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com> --- .github/workflows/windows-release-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index 4622f4de0..c6333e8b0 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -90,6 +90,7 @@ jobs: set -x mkdir -p ~/win-cross cd engine/ + sudo add-apt-repository ppa:savoury1/backports sudo apt-get update sudo apt-get install -y python3-pip autoconf \ autoconf2.13 \ @@ -131,7 +132,7 @@ jobs: wget \ zip \ zlib1g-dev \ - aria2c + aria2 echo Setup wine aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst tar --zstd -xvf wine.tar.zst -C ~/win-cross