From 6a7a613741fe32fa14897a4f780d7382105a103c Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 21 Mar 2024 23:54:28 +0100 Subject: [PATCH] Update the CI run with multiplayer tests --- .github/workflows/android.yml | 2 ++ .github/workflows/cpp_lint.yml | 2 ++ .github/workflows/linux.yml | 2 ++ .github/workflows/lua.yml | 12 ++++++------ .github/workflows/macos.yml | 2 ++ .github/workflows/windows.yml | 2 ++ 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ffcae5cf5..c59dd6732 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -8,6 +8,8 @@ on: - 'lib/**.cpp' - 'src/**.[ch]' - 'src/**.cpp' + - 'irr/**.[ch]' + - 'irr/**.cpp' - '**/CMakeLists.txt' - 'cmake/Modules/**' - 'android/**' diff --git a/.github/workflows/cpp_lint.yml b/.github/workflows/cpp_lint.yml index 51c6c8273..79b8ffc4e 100644 --- a/.github/workflows/cpp_lint.yml +++ b/.github/workflows/cpp_lint.yml @@ -8,6 +8,8 @@ on: - 'lib/**.cpp' - 'src/**.[ch]' - 'src/**.cpp' + - 'irr/**.[ch]' + - 'irr/**.cpp' - '**/CMakeLists.txt' - 'cmake/Modules/**' - 'util/ci/**' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e80e4df31..eb2b032da 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -8,6 +8,8 @@ on: - 'lib/**.cpp' - 'src/**.[ch]' - 'src/**.cpp' + - 'irr/**.[ch]' + - 'irr/**.cpp' - '**/CMakeLists.txt' - 'cmake/Modules/**' - 'util/ci/**' diff --git a/.github/workflows/lua.yml b/.github/workflows/lua.yml index ff556908f..6f803d133 100644 --- a/.github/workflows/lua.yml +++ b/.github/workflows/lua.yml @@ -14,24 +14,24 @@ on: - '.github/workflows/**.yml' jobs: - # Note that the integration tests are also run build.yml, but only when C++ code is changed. + # Note that the integration tests are also run in build.yml, but only when C++ code is changed. integration_tests: name: "Compile and run multiplayer tests" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Install deps run: | source ./util/ci/common.sh - install_linux_deps clang-10 gdb libluajit-5.1-dev + install_linux_deps clang gdb libluajit-5.1-dev - name: Build run: | ./util/ci/build.sh env: - CC: clang-10 - CXX: clang++-10 - CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0" + CC: clang + CXX: clang++ + CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0 -DBUILD_UNITTESTS=0" - name: Integration test + devtest run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 77df1e3ea..24c2b9f51 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,6 +8,8 @@ on: - 'lib/**.cpp' - 'src/**.[ch]' - 'src/**.cpp' + - 'irr/**.[ch]' + - 'irr/**.cpp' - '**/CMakeLists.txt' - 'cmake/Modules/**' - '.github/workflows/macos.yml' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e2303ff24..061bd704b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,6 +8,8 @@ on: - 'lib/**.cpp' - 'src/**.[ch]' - 'src/**.cpp' + - 'irr/**.[ch]' + - 'irr/**.cpp' - '**/CMakeLists.txt' - 'cmake/Modules/**' - 'util/buildbot/**'