summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2022-07-30 11:58:47 +0200
committersfan5 <sfan5@live.de>2022-09-14 13:48:06 +0200
commit9441b69ad2daae0684ab962e7e240d410134ca55 (patch)
tree4adfc52a5ed4360b76453d191e4d423595fbcc4c /.github
parent08e3d16a58434b1871330d862f21d5897c6af744 (diff)
downloadminetest-9441b69ad2daae0684ab962e7e240d410134ca55.tar.gz
minetest-9441b69ad2daae0684ab962e7e240d410134ca55.tar.bz2
minetest-9441b69ad2daae0684ab962e7e240d410134ca55.zip
Move some CI jobs to newer compiler versions
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml31
-rw-r--r--.github/workflows/macos.yml12
2 files changed, 19 insertions, 24 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d578c3d9f..282dbe307 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,21 +52,21 @@ jobs:
./bin/minetest --run-unittests
# Current gcc version
- gcc_10:
- runs-on: ubuntu-20.04
+ gcc_12:
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Install deps
run: |
source ./util/ci/common.sh
- install_linux_deps g++-10
+ install_linux_deps g++-12 libluajit-5.1-dev
- name: Build
run: |
./util/ci/build.sh
env:
- CC: gcc-10
- CXX: g++-10
+ CC: gcc-12
+ CXX: g++-12
- name: Test
run: |
@@ -80,7 +80,7 @@ jobs:
- name: Install deps
run: |
source ./util/ci/common.sh
- install_linux_deps clang-3.9 gdb
+ install_linux_deps clang-3.9 valgrind
- name: Build
run: |
@@ -93,35 +93,34 @@ jobs:
run: |
./bin/minetest --run-unittests
- - name: Integration test + devtest
+ - name: Valgrind
run: |
- ./util/test_multiplayer.sh
+ valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/minetest --run-unittests
# Current clang version
- clang_10:
- runs-on: ubuntu-20.04
+ clang_14:
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Install deps
run: |
source ./util/ci/common.sh
- install_linux_deps clang-10 valgrind libluajit-5.1-dev
+ install_linux_deps clang-14 gdb
- name: Build
run: |
./util/ci/build.sh
env:
- CC: clang-10
- CXX: clang++-10
- CMAKE_FLAGS: "-DREQUIRE_LUAJIT=1"
+ CC: clang-14
+ CXX: clang++-14
- name: Test
run: |
./bin/minetest --run-unittests
- - name: Valgrind
+ - name: Integration test + devtest
run: |
- valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/minetest --run-unittests
+ ./util/test_multiplayer.sh
# Build with prometheus-cpp (server-only)
clang_9_prometheus:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 038765494..edc6630c0 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -28,16 +28,13 @@ env:
jobs:
build:
- runs-on: macos-10.15
+ runs-on: macos-11
steps:
- uses: actions/checkout@v3
- name: Install deps
run: |
- pkgs=(cmake freetype gettext gmp hiredis jpeg jsoncpp leveldb libogg libpng libvorbis luajit zstd)
- brew update
- brew install ${pkgs[@]}
- brew unlink $(brew ls --formula)
- brew link ${pkgs[@]}
+ source ./util/ci/common.sh
+ install_macos_deps
- name: Build
run: |
@@ -49,8 +46,7 @@ jobs:
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \
-DCMAKE_FIND_FRAMEWORK=LAST \
-DCMAKE_INSTALL_PREFIX=../build/macos/ \
- -DRUN_IN_PLACE=FALSE \
- -DENABLE_FREETYPE=TRUE -DENABLE_GETTEXT=TRUE
+ -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE
make -j2
make install