From 5c2718de034f2c23313cf70688c5d7da04b183b4 Mon Sep 17 00:00:00 2001 From: Vincent Stumpf Date: Wed, 12 Jul 2023 03:22:52 +0000 Subject: [PATCH] Add concurrency and dependency on CMakeLists.txt --- .github/workflows/analysis_codeql.yml | 4 +++- .github/workflows/build_servers_cmake.yml | 2 +- .github/workflows/build_servers_modes.yml | 4 +++- .github/workflows/build_servers_packetversions.yml | 4 +++- .github/workflows/build_servers_vip.yml | 4 +++- .github/workflows/npc_db_validation.yml | 4 +++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/analysis_codeql.yml b/.github/workflows/analysis_codeql.yml index 692a03e5f5..8d839173d4 100644 --- a/.github/workflows/analysis_codeql.yml +++ b/.github/workflows/analysis_codeql.yml @@ -18,6 +18,8 @@ on: # This workflow should run when a file in a source directory has been modified. - 'src/**' - '3rdparty/**' + # This workflow should run whenever a CMake related file has been modified + - '**/CMakeLists.txt' jobs: analyze: @@ -84,7 +86,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . --target server + run: cmake --build -j2 . --target server - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/build_servers_cmake.yml b/.github/workflows/build_servers_cmake.yml index adfc7448ca..159002312b 100644 --- a/.github/workflows/build_servers_cmake.yml +++ b/.github/workflows/build_servers_cmake.yml @@ -46,4 +46,4 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build # Execute the build. You can specify a specific target with "--target " - run: cmake --build . --target server tools + run: cmake --build -j2 . --target server tools diff --git a/.github/workflows/build_servers_modes.yml b/.github/workflows/build_servers_modes.yml index 73d48ff202..1f782e1c6f 100644 --- a/.github/workflows/build_servers_modes.yml +++ b/.github/workflows/build_servers_modes.yml @@ -18,6 +18,8 @@ on: # This workflow should run when a file in a source directory has been modified. - 'src/**' - '3rdparty/**' + # This workflow should run whenever a CMake related file has been modified + - '**/CMakeLists.txt' jobs: build: @@ -68,7 +70,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . --target server + run: cmake --build -j2 . --target server - name: Run Once - login-server run: ./login-server --run-once diff --git a/.github/workflows/build_servers_packetversions.yml b/.github/workflows/build_servers_packetversions.yml index 0455c46dfd..48a123e8b0 100644 --- a/.github/workflows/build_servers_packetversions.yml +++ b/.github/workflows/build_servers_packetversions.yml @@ -18,6 +18,8 @@ on: # This workflow should run when a file in a source directory has been modified. - 'src/**' - '3rdparty/**' + # This workflow should run whenever a CMake related file has been modified + - '**/CMakeLists.txt' jobs: build: @@ -70,4 +72,4 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . + run: cmake --build -j2 . diff --git a/.github/workflows/build_servers_vip.yml b/.github/workflows/build_servers_vip.yml index 553d9f63fa..7e7ea74c0b 100644 --- a/.github/workflows/build_servers_vip.yml +++ b/.github/workflows/build_servers_vip.yml @@ -18,6 +18,8 @@ on: # This workflow should run when a file in a source directory has been modified. - 'src/**' - '3rdparty/**' + # This workflow should run whenever a CMake related file has been modified + - '**/CMakeLists.txt' jobs: build: @@ -68,7 +70,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . --target server + run: cmake --build -j2 . --target server - name: Run Once - login-server run: ./login-server --run-once diff --git a/.github/workflows/npc_db_validation.yml b/.github/workflows/npc_db_validation.yml index f6d6fa50d3..af83dcae13 100644 --- a/.github/workflows/npc_db_validation.yml +++ b/.github/workflows/npc_db_validation.yml @@ -21,6 +21,8 @@ on: # This workflow should run when a file in either the db/ or npc/ directory has been modified. - 'db/**' - 'npc/**' + # This workflow should run whenever a CMake related file has been modified + - '**/CMakeLists.txt' jobs: build: @@ -71,7 +73,7 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build - run: cmake --build . --target map-server + run: cmake --build -j2 . --target map-server # npc.sh enables all NPC scripts in the custom and test folders. - name: Enable All NPCs for Testing