From 2506fc7f48caec0f67cfb7e929fba12a2789c808 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Mon, 7 Apr 2025 07:53:50 +0400 Subject: [PATCH 1/6] Change runners --- .github/workflows/run-tests-feature-branch.yml | 3 ++- .github/workflows/testing.yml | 3 ++- .github/workflows/version-increment.yml | 5 +++-- dist/googletest | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests-feature-branch.yml b/.github/workflows/run-tests-feature-branch.yml index 08fbc89b..55dc810c 100644 --- a/.github/workflows/run-tests-feature-branch.yml +++ b/.github/workflows/run-tests-feature-branch.yml @@ -5,7 +5,8 @@ on: jobs: testing: - runs-on: self-hosted + runs-on: ubuntu-latest + container: hyperwin/hcpu-ci:debian-unstable if: (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/dev') || !contains(github.event.head_commit.message, '[ci skip]') steps: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9530b53a..25964674 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -7,7 +7,8 @@ on: jobs: testing: - runs-on: self-hosted + runs-on: ubuntu-latest + container: hyperwin/hcpu-ci:debian-unstable name: Run full test suite steps: diff --git a/.github/workflows/version-increment.yml b/.github/workflows/version-increment.yml index 686b3b4c..25200c70 100644 --- a/.github/workflows/version-increment.yml +++ b/.github/workflows/version-increment.yml @@ -7,7 +7,8 @@ on: jobs: versioning-patch-increment: - runs-on: self-hosted + runs-on: ubuntu-latest + container: hyperwin/hcpu-ci:debian-unstable if: "contains(github.event.head_commit.message, '[ci patch inc]')" permissions: contents: write @@ -55,4 +56,4 @@ jobs: git add . git commit -m "[auto]: Increment minor version" git push origin master - \ No newline at end of file + diff --git a/dist/googletest b/dist/googletest index 2b6b042a..3fbe4db9 160000 --- a/dist/googletest +++ b/dist/googletest @@ -1 +1 @@ -Subproject commit 2b6b042a77446ff322cd7522ca068d9f2a21c1d1 +Subproject commit 3fbe4db9a39291ae8d7a9c5f1d75896bb4c5a18f From 35c400f70cd490a727d0f2a3467aa26bba633874 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Mon, 7 Apr 2025 07:58:09 +0400 Subject: [PATCH 2/6] Remove submodule update step --- .github/workflows/run-tests-feature-branch.yml | 4 ---- .github/workflows/testing.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/run-tests-feature-branch.yml b/.github/workflows/run-tests-feature-branch.yml index 55dc810c..31363309 100644 --- a/.github/workflows/run-tests-feature-branch.yml +++ b/.github/workflows/run-tests-feature-branch.yml @@ -15,10 +15,6 @@ jobs: with: submodules: 'true' - - name: Pull submodules - run: | - git submodule update --init --remote --recursive - - name: Install all tools uses: aminya/setup-cpp@v1 with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 25964674..2262e9fc 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,10 +16,6 @@ jobs: uses: actions/checkout@v4 with: submodules: 'true' - - - name: Pull submodules - run: | - git submodule update --init --remote --recursive - name: Install GTest Parallelizer run: | From 3eff377a12bdd79676cc4ecfb7be3cfbcf48b171 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Mon, 7 Apr 2025 13:27:31 +0400 Subject: [PATCH 3/6] Make versioning-minor-increment job use GH runner --- .github/workflows/version-increment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/version-increment.yml b/.github/workflows/version-increment.yml index 25200c70..47d69962 100644 --- a/.github/workflows/version-increment.yml +++ b/.github/workflows/version-increment.yml @@ -33,7 +33,8 @@ jobs: git push origin master versioning-minor-increment: - runs-on: self-hosted + runs-on: ubuntu-latest + container: hyperwin/hcpu-ci:debian-unstable if: "contains(github.event.head_commit.message, '[ci minor inc]')" permissions: contents: write From c95ece3bd3131ca13a5548a3facb919cd5690a81 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 8 Apr 2025 07:24:43 +0400 Subject: [PATCH 4/6] Disable GTest Parallelizer --- .github/workflows/testing.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2262e9fc..d3bd2a88 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,39 +16,35 @@ jobs: uses: actions/checkout@v4 with: submodules: 'true' - - - name: Install GTest Parallelizer - run: | - git -C "../gtest-parallel" pull || git clone https://github.com/google/gtest-parallel.git "../gtest-parallel" - name: Build and test with GCC on Debug profile run: | cmake -S. -Bbuild -DHCPU_COMPILER=gcc -DCMAKE_BUILD_TYPE=Debug cmake --build build --target build-all-tests-github -j4 - ../gtest-parallel/gtest-parallel build/modular_testing --workers=4 - ../gtest-parallel/gtest-parallel build/integration_testing --workers=4 + build/modular_testing --gtest_brief + build/integration_testing --gtest_brief rm -rf build - name: Build and test with GCC on Release profile run: | cmake -S. -Bbuild -DHCPU_COMPILER=gcc -DCMAKE_BUILD_TYPE=Release cmake --build build --target build-all-tests-github -j4 - ../gtest-parallel/gtest-parallel build/modular_testing --workers=4 - ../gtest-parallel/gtest-parallel build/integration_testing --workers=4 + build/modular_testing --gtest_brief + build/integration_testing --gtest_brief rm -rf build - name: Build and test with LLVM on Debug profile run: | cmake -S. -Bbuild -DHCPU_COMPILER=clang -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_BUILD_TYPE=Release cmake --build build --target build-all-tests-github -j4 - ../gtest-parallel/gtest-parallel build/modular_testing --workers=4 - ../gtest-parallel/gtest-parallel build/integration_testing --workers=4 + build/modular_testing --gtest_brief + build/integration_testing --gtest_brief rm -rf build - name: Build and test with LLVM on Release profile run: | cmake -S. -Bbuild -DHCPU_COMPILER=clang -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_BUILD_TYPE=Release cmake --build build --target build-all-tests-github -j4 - ../gtest-parallel/gtest-parallel build/modular_testing --workers=4 - ../gtest-parallel/gtest-parallel build/integration_testing --workers=4 + build/modular_testing --gtest_brief + build/integration_testing --gtest_brief rm -rf build From 7f270a58e3e80dd0b0ca9999286b08ea7cb4f459 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 8 Apr 2025 07:31:49 +0400 Subject: [PATCH 5/6] Fix feature branch workflow --- .github/workflows/run-tests-feature-branch.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/run-tests-feature-branch.yml b/.github/workflows/run-tests-feature-branch.yml index 31363309..5ed0fbdf 100644 --- a/.github/workflows/run-tests-feature-branch.yml +++ b/.github/workflows/run-tests-feature-branch.yml @@ -14,31 +14,21 @@ jobs: uses: actions/checkout@v4 with: submodules: 'true' - - - name: Install all tools - uses: aminya/setup-cpp@v1 - with: - cmake: true - cppcheck: true - - - name: Install GTest Parallelizer - run: | - git -C "../gtest-parallel" pull || git clone https://github.com/google/gtest-parallel.git "../gtest-parallel" - name: Build and test with GCC on Release profile run: | cmake -S. -Bbuild -DHCPU_COMPILER=gcc -DCMAKE_BUILD_TYPE=Release cmake --build build --target build-all-tests-github -j4 - ../gtest-parallel/gtest-parallel build/modular_testing --workers=4 - ../gtest-parallel/gtest-parallel build/integration_testing --workers=4 + build/modular_testing --gtest_brief + build/integration_testing --gtest_brief rm -rf build - name: Build and test with LLVM on Release profile run: | cmake -S. -Bbuild -DHCPU_COMPILER=clang -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DCMAKE_BUILD_TYPE=Release cmake --build build --target build-all-tests-github -j4 - ../gtest-parallel/gtest-parallel build/modular_testing --workers=4 - ../gtest-parallel/gtest-parallel build/integration_testing --workers=4 + build/modular_testing --gtest_brief + build/integration_testing --gtest_brief - name: Lint code run: | From 6588ebb874c08811f8038d717f64f510d6f436d5 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Tue, 8 Apr 2025 07:48:16 +0400 Subject: [PATCH 6/6] Disable linting --- .github/workflows/run-tests-feature-branch.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/run-tests-feature-branch.yml b/.github/workflows/run-tests-feature-branch.yml index 5ed0fbdf..f6c2a64c 100644 --- a/.github/workflows/run-tests-feature-branch.yml +++ b/.github/workflows/run-tests-feature-branch.yml @@ -30,11 +30,6 @@ jobs: build/modular_testing --gtest_brief build/integration_testing --gtest_brief - - name: Lint code - run: | - cp build/compile_commands.json . - cppcheck --project=compile_commands.json --check-level=exhaustive -idist -j4 - - name: Clean up run: | rm -rf build