MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build with gcc-10 for better system compat

develop
Myk Taylor 2023-07-28 16:16:36 -07:00
parent 83a6824399
commit 73427de994
No known key found for this signature in database
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build.yml vendored
Unescape Escape View File

@ -132,6 +132,8 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install \ sudo apt-get install \
ccache \ ccache \
gcc-10 \
g++-10 \
libgl-dev \ libgl-dev \
libxml-libxslt-perl \ libxml-libxslt-perl \
ninja-build ninja-build
@ -145,15 +147,18 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-ubuntu-22.04-gcc-11-${{ github.ref_name }}-${{ github.sha }} key: ccache-ubuntu-22.04-gcc-10-${{ github.ref_name }}-${{ github.sha }}
restore-keys: | restore-keys: |
ccache-ubuntu-22.04-gcc-11-${{ github.ref_name }} ccache-ubuntu-22.04-gcc-10-${{ github.ref_name }}
ccache-ubuntu-22.04-gcc-11 ccache-ubuntu-22.04-gcc-10
- name: Set up environment - name: Set up environment
id: env_setup id: env_setup
run: | run: |
echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
- name: Configure DFHack - name: Configure DFHack
env:
CC: gcc-10
CXX: g++-10
run: | run: |
cmake \ cmake \
-S . \ -S . \

9
.github/workflows/steam.yml vendored
Unescape Escape View File

@ -32,6 +32,8 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install \ sudo apt-get install \
ccache \ ccache \
gcc-10 \
g++-10 \
libgl-dev \ libgl-dev \
libxml-libxslt-perl \ libxml-libxslt-perl \
ninja-build ninja-build
@ -53,9 +55,9 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-ubuntu-22.04-gcc-11-${{ github.sha }} key: ccache-ubuntu-22.04-gcc-10-${{ github.sha }}
restore-keys: | restore-keys: |
ccache-ubuntu-22.04-gcc-11 ccache-ubuntu-22.04-gcc-10
- name: Fetch win64 ccache - name: Fetch win64 ccache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
@ -68,6 +70,9 @@ jobs:
run: | run: |
echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV echo "CCACHE_DIR=${HOME}/.ccache" >> $GITHUB_ENV
- name: Configure DFHack - name: Configure DFHack
env:
CC: gcc-10
CXX: g++-10
run: | run: |
cmake \ cmake \
-S . \ -S . \