From bf23262b6c0a3226dd14cc904ced83edf93c5216 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Jun 2024 22:04:55 -0400 Subject: [PATCH 1/3] Remove apt upgrade calls in workflow Was discussed that these two calls are unnecessary, time-consuming, and a recurrent point of failure. --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 228093db55..fa98ad3adb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,8 +23,6 @@ jobs: - name: Update and Install Software run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt update - sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev ppa-purge sudo ppa-purge -y ppa:ubuntu-toolchain-r/test || true sudo dpkg --add-architecture i386 From c75749dbff2470a70989d8e6efaa5fdc6f6dcd92 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Jun 2024 22:23:55 -0400 Subject: [PATCH 2/3] Hardcode 4 CPUs Due to resource limits on public build agents https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories --- .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 fa98ad3adb..21ded5196f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,14 +61,14 @@ jobs: GAME_VERSION: HEARTGOLD GAME_LANGUAGE: ENGLISH GAME_REVISION: 0 - run: make -j${nproc} + run: make -j4 - name: Build SoulSilver env: GAME_VERSION: SOULSILVER GAME_LANGUAGE: ENGLISH GAME_REVISION: 0 - run: make -j${nproc} + run: make -j4 - name: Webhook if: ${{ github.event_name == 'push' }} From e67cbd5bbc0346c919104415cd37eef6188fd997 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jul 2024 15:42:46 -0400 Subject: [PATCH 3/3] Restore apt update call --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21ded5196f..5cde394844 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,7 @@ jobs: - name: Update and Install Software run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt update sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev ppa-purge sudo ppa-purge -y ppa:ubuntu-toolchain-r/test || true sudo dpkg --add-architecture i386