1
0

Fix and update Actions

This commit is contained in:
Maksym H 2022-12-05 16:58:02 +02:00
parent 6c5022f692
commit ebe6a07c9a
3 changed files with 34 additions and 35 deletions

View File

@ -48,22 +48,22 @@ jobs:
# run: | # run: |
# ./bin/multicraft --run-unittests # ./bin/multicraft --run-unittests
# This is the current gcc compiler (available in bionic) # This is the current gcc compiler (available in jammy)
gcc_8: gcc_10:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps g++-8 install_linux_deps g++-10
- name: Build - name: Build
run: | run: |
./util/ci/build.sh ./util/ci/build.sh
env: env:
CC: gcc-8 CC: gcc-10
CXX: g++-8 CXX: g++-10
- name: Test - name: Test
run: | run: |
@ -92,30 +92,30 @@ jobs:
# ./bin/multicraft --run-unittests # ./bin/multicraft --run-unittests
# This is the current clang version # This is the current clang version
clang_9: clang_11:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps clang-9 valgrind libluajit-5.1-dev install_linux_deps clang-11 valgrind libluajit-5.1-dev
- name: Build - name: Build
run: | run: |
./util/ci/build.sh ./util/ci/build.sh
env: env:
CC: clang-9 CC: clang-11
CXX: clang++-9 CXX: clang++-11
CMAKE_FLAGS: "-DREQUIRE_LUAJIT=1" CMAKE_FLAGS: "-DREQUIRE_LUAJIT=1"
- name: Test - name: Test
run: | run: |
./bin/multicraft --run-unittests ./bin/multicraft --run-unittests
- name: Valgrind # - name: Valgrind
run: | # run: |
valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/multicraft --run-unittests # valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ./bin/multicraft --run-unittests
# Build with prometheus-cpp (server-only) # Build with prometheus-cpp (server-only)
# clang_9_prometheus: # clang_9_prometheus:
@ -171,18 +171,18 @@ jobs:
docker: docker:
name: "Docker image" name: "Docker image"
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Build docker image - name: Build docker image
run: | run: |
docker build . docker build .
win32: win32:
name: "MinGW cross-compiler (32-bit)" name: "MinGW cross-compiler (32-bit)"
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install compiler - name: Install compiler
run: | run: |
sudo apt-get update -q && sudo apt-get install gettext -qyy sudo apt-get update -q && sudo apt-get install gettext -qyy
@ -198,9 +198,9 @@ jobs:
win64: win64:
name: "MinGW cross-compiler (64-bit)" name: "MinGW cross-compiler (64-bit)"
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install compiler - name: Install compiler
run: | run: |
sudo apt-get update -q && sudo apt-get install gettext -qyy sudo apt-get update -q && sudo apt-get install gettext -qyy
@ -218,9 +218,9 @@ jobs:
name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
runs-on: windows-2019 runs-on: windows-2019
env: env:
VCPKG_VERSION: af2287382b1991dbdcb7e5112d236f3323b9dd7a VCPKG_VERSION: 6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2
# 2022.03.10 # 2022.11.14
vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit libiconv gettext jsoncpp vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit gmp libiconv gettext jsoncpp
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -242,7 +242,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Restore from cache and run vcpkg - name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v7 uses: lukka/run-vcpkg@v7
@ -259,7 +259,6 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" `
-DCMAKE_BUILD_TYPE=Release ` -DCMAKE_BUILD_TYPE=Release `
-DENABLE_POSTGRESQL=OFF ` -DENABLE_POSTGRESQL=OFF `
-DENABLE_SYSTEM_JSONCPP=ON `
-DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} . -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
- name: Build - name: Build

View File

@ -25,27 +25,27 @@ on:
jobs: jobs:
clang_format: clang_format:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install clang-format - name: Install clang-format
run: | run: |
sudo apt-get install clang-format-9 -qyy sudo apt-get install clang-format-11 -qyy
- name: Run clang-format - name: Run clang-format
run: | run: |
source ./util/ci/lint.sh source ./util/ci/lint.sh
perform_lint perform_lint
env: env:
CLANG_FORMAT: clang-format-9 CLANG_FORMAT: clang-format-11
clang_tidy: clang_tidy:
runs-on: ubuntu-18.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get install clang-tidy-9 -qyy sudo apt-get install clang-tidy-11 -qyy
source ./util/ci/common.sh source ./util/ci/common.sh
install_linux_deps install_linux_deps

View File

@ -12,6 +12,6 @@ make GenerateVersion
cd .. cd ..
./util/ci/run-clang-tidy.py \ ./util/ci/run-clang-tidy.py \
-clang-tidy-binary=clang-tidy-9 -p cmakebuild \ -clang-tidy-binary=clang-tidy-11 -p cmakebuild \
-quiet -config="$(cat .clang-tidy)" \ -quiet -config="$(cat .clang-tidy)" \
'src/.*' 'src/.*'