diff options
| author | meme <meme@users.noreply.github.com> | 2020-12-28 22:38:52 -0500 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-12-29 17:42:04 +0100 |
| commit | 23b23cee5a8e7b0666de3d5a0991bc1b3bb8d244 (patch) | |
| tree | b91e24f2839c2ff8b27545c11e084a4cb19e886c /.github | |
| parent | 8ca0e8325a5e2cc94b0a54d3ea9995fe33b75cde (diff) | |
| download | serenity-23b23cee5a8e7b0666de3d5a0991bc1b3bb8d244.zip | |
Build: Support non-i686 toolchains
* Add SERENITY_ARCH option to CMake for selecting the target toolchain
* Port all build scripts but continue to use i686
* Update GitHub Actions cache to include BuildIt.sh
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/cmake.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 249463f391..0c2e978a92 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -48,7 +48,7 @@ jobs: # This assumes that *ALL* LibC headers have an impact on the Toolchain. # This is wrong, and causes more Toolchain rebuilds than necessary. # However, we want to avoid false cache hits at all costs. - key: ${{ runner.os }}-toolchain-${{ hashFiles('Libraries/LibC/**/*.h', 'Toolchain/Patches/*.patch') }} + key: ${{ runner.os }}-toolchain-i686-${{ hashFiles('Libraries/LibC/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/BuildIt.sh') }} - name: Restore or regenerate Toolchain run: TRY_USE_LOCAL_TOOLCHAIN=y ${{ github.workspace }}/Toolchain/BuildIt.sh @@ -155,7 +155,7 @@ jobs: # This assumes that *ALL* LibC headers have an impact on the Toolchain. # This is wrong, and causes more Toolchain rebuilds than necessary. # However, we want to avoid false cache hits at all costs. - key: ${{ runner.os }}-toolchain-${{ hashFiles('Libraries/LibC/**/*.h', 'Toolchain/Patches/*.patch') }} + key: ${{ runner.os }}-toolchain-i686-${{ hashFiles('Libraries/LibC/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/BuildIt.sh') }} - name: Restore or regenerate Toolchain run: TRY_USE_LOCAL_TOOLCHAIN=y ${{ github.workspace }}/Toolchain/BuildIt.sh |