Merge remote-tracking branch 'lethosor/gha-ubuntu-gcc-upgrade' into develop

develop
lethosor 2022-06-09 01:40:39 -04:00
commit 92cd9ef350
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 7 additions and 3 deletions

@ -17,8 +17,8 @@ jobs:
plugins: plugins:
- default - default
include: include:
- os: ubuntu-20.04 - os: ubuntu-22.04
gcc: 11 gcc: 12
plugins: all plugins: all
steps: steps:
- name: Set up Python 3 - name: Set up Python 3
@ -56,6 +56,7 @@ jobs:
echo "::set-output name=df_version::${DF_VERSION}" echo "::set-output name=df_version::${DF_VERSION}"
echo "DF_VERSION=${DF_VERSION}" >> $GITHUB_ENV echo "DF_VERSION=${DF_VERSION}" >> $GITHUB_ENV
echo "DF_FOLDER=${HOME}/DF/${DF_VERSION}/df_linux" >> $GITHUB_ENV echo "DF_FOLDER=${HOME}/DF/${DF_VERSION}/df_linux" >> $GITHUB_ENV
echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
- name: Fetch DF cache - name: Fetch DF cache
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
@ -87,10 +88,13 @@ jobs:
-DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \ -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
-DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \ -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
-DBUILD_SUPPORTED:BOOL=1 \ -DBUILD_SUPPORTED:BOOL=1 \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_INSTALL_PREFIX="$DF_FOLDER" -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
- name: Build DFHack - name: Build DFHack
run: | run: |
ninja -C build-ci install ninja -C build-ci install
ccache --show-stats
- name: Run tests - name: Run tests
id: run_tests id: run_tests
run: | run: |

@ -1 +1 @@
Subproject commit 2908625499accc4899e9a9f0e999c95be26ce14d Subproject commit 841803ca6f173f4d97eea376b4dcd512336e35e2