Fixing foreign runner workflows (#275)

* wf * wf * wf * wf * wf
ParadoxGameConverters · Jan 28, 2025 · b8ecf12 · b8ecf12
1 parent 8876106
commit b8ecf12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/linux_codeql-analysis.yml b/.github/workflows/linux_codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
   analyze:
     name: Analyze
     if: github.repository_owner != 'ParadoxGameConverters'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -69,7 +69,7 @@ jobs:
        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
        sudo apt-get update
        sudo apt-get install gcc-11 g++-11
-       sudo apt-get install libgtest-dev
+       sudo apt-get install libgtest-dev ninja-build
        sudo ln -s /usr/bin/gcc-11 /usr/local/bin/gcc
        sudo ln -s /usr/bin/g++-11 /usr/local/bin/g++
        cmake --preset x64-release-linux

diff --git a/.github/workflows/linux_coverage.yml b/.github/workflows/linux_coverage.yml
@@ -56,7 +56,7 @@ jobs:
   analyze:
     name: Coverage Check Foreign
     if: github.repository_owner != 'ParadoxGameConverters'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -74,9 +74,9 @@ jobs:
       run: |
        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
        sudo apt-get update
-       sudo apt-get install libcurl4-openssl-dev lcov
+       sudo apt-get install libcurl4-openssl-dev lcov ninja-build
        cmake --preset x64-coverage-linux
-       cmake --build --preset build-x64-coverage-linux --target commonLib CommonItemsTests -- -j40
+       cmake --build --preset build-x64-coverage-linux --target commonLib CommonItemsTests -- -j3
 
     - name: Run tests
       run: |
@@ -90,7 +90,7 @@ jobs:
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: build/lcoverage/coverage.info
+        path-to-lcov: build/x64-coverage-linux/lcoverage/coverage.info
 
     - name: Cleanup
       uses: colpal/actions-clean@v1

diff --git a/.github/workflows/windows_cmake_build.yml b/.github/workflows/windows_cmake_build.yml
@@ -66,7 +66,7 @@ jobs:
       run: |
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         cmake --preset x64-release-windows
-        cmake --build --preset build-x64-release-windows --target commonLib -- -j40
+        cmake --build --preset build-x64-release-windows --target commonLib CommonItemsTests -- -j3
 
     - name: "Run tests"
       run: |