diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31fde3b1d..21b3096d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,8 @@ jobs: plugins: - default include: - - os: ubuntu-20.04 - gcc: 11 + - os: ubuntu-22.04 + gcc: 12 plugins: all steps: - name: Set up Python 3 @@ -56,6 +56,7 @@ jobs: echo "::set-output name=df_version::${DF_VERSION}" echo "DF_VERSION=${DF_VERSION}" >> $GITHUB_ENV echo "DF_FOLDER=${HOME}/DF/${DF_VERSION}/df_linux" >> $GITHUB_ENV + echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV - name: Fetch DF cache uses: actions/cache@v2 with: @@ -87,10 +88,13 @@ jobs: -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \ -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \ -DBUILD_SUPPORTED:BOOL=1 \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_INSTALL_PREFIX="$DF_FOLDER" - name: Build DFHack run: | ninja -C build-ci install + ccache --show-stats - name: Run tests id: run_tests run: | diff --git a/plugins/stonesense b/plugins/stonesense index 290862549..841803ca6 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 2908625499accc4899e9a9f0e999c95be26ce14d +Subproject commit 841803ca6f173f4d97eea376b4dcd512336e35e2