From de451c13f9703951a9f2aa927c0d10e4a1d2c15f Mon Sep 17 00:00:00 2001 From: Jack Wright <68773585+Ethirix@users.noreply.github.com> Date: Wed, 21 Jan 2026 21:33:18 +0000 Subject: [PATCH 1/2] Converted Workflows to Composite Actions --- .github/workflows/codeql.yml | 28 +++++++++++-------- .../pr-xplat-build-test-autocomplete.yml | 10 ------- .github/workflows/pr-xplat-build-test.yml | 23 +++++++-------- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 05215b9..9938220 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,34 +2,38 @@ name: CodeQL on: pull_request: branches: [ "master" ] - + jobs: codeql: + runs-on: ubuntu-latest permissions: security-events: write packages: read + contents: read - strategy: + strategy: fail-fast: true - matrix: include: - language: c-cpp build-mode: manual - manual-command-list: > + manual-command-list: > cmake -S . -B ./build -G "Ninja Multi-Config" -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS="-O3 -Wall -std=c++23" cmake --build ./build --config Release - + - language: actions build-mode: none - - uses: VolcanusLucis/.github/.github/workflows/shared-codeql.yml@master - with: - language: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} - manual-command-list: ${{ matrix.manual-command-list }} + + steps: + - run: echo "Running CodeQL for ${{ matrix.language }}" + - name: Run CodeQL + uses: VolcanusLucis/.github/.github/actions/shared-codeql.yml@master + with: + language: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + manual-command-list: ${{ matrix.manual-command-list }} run-codeql: permissions: @@ -43,4 +47,4 @@ jobs: - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }} - run: exit 1 + run: exit 1 \ No newline at end of file diff --git a/.github/workflows/pr-xplat-build-test-autocomplete.yml b/.github/workflows/pr-xplat-build-test-autocomplete.yml index e1a8ca0..ed52067 100644 --- a/.github/workflows/pr-xplat-build-test-autocomplete.yml +++ b/.github/workflows/pr-xplat-build-test-autocomplete.yml @@ -10,16 +10,6 @@ on: - 'CMake**.**' jobs: - build: - uses: VolcanusLucis/.github/.github/workflows/build-cmake-project-presets.yml@master - with: - architecture: '' - build-tool: '' - build-type: '' - compiler: '' - target: '' - bypass: true - build-all: if: always() runs-on: ubuntu-latest diff --git a/.github/workflows/pr-xplat-build-test.yml b/.github/workflows/pr-xplat-build-test.yml index b05db53..cabc459 100644 --- a/.github/workflows/pr-xplat-build-test.yml +++ b/.github/workflows/pr-xplat-build-test.yml @@ -1,7 +1,4 @@ name: Cross-platform Builds -permissions: - contents: read - on: pull_request: branches: [ 'master' ] @@ -12,9 +9,12 @@ on: jobs: build: + runs-on: ubuntu-latest + permissions: + contents: read + strategy: fail-fast: true - matrix: build-tool: [ ninja ] compiler: [ mingw64, gcc ] @@ -27,13 +27,14 @@ jobs: - target: linux compiler: mingw64 - uses: VolcanusLucis/.github/.github/workflows/build-cmake-project-presets.yml@master - with: - architecture: ${{ matrix.architecture }} - build-tool: ${{ matrix.build-tool }} - build-type: ${{ matrix.build-type }} - compiler: ${{ matrix.compiler }} - target: ${{ matrix.target }} + steps: + - uses: VolcanusLucis/.github/.github/actions/build-cmake-project-presets.yml@master + with: + architecture: ${{ matrix.architecture }} + build-tool: ${{ matrix.build-tool }} + build-type: ${{ matrix.build-type }} + compiler: ${{ matrix.compiler }} + target: ${{ matrix.target }} build-all: if: always() From fa00b271a3c05c6b4e9026d133f6b75081be4b1b Mon Sep 17 00:00:00 2001 From: Jack Wright <68773585+Ethirix@users.noreply.github.com> Date: Wed, 21 Jan 2026 21:51:19 +0000 Subject: [PATCH 2/2] Fixed Composite Actions Lookup --- .github/workflows/codeql.yml | 2 +- .github/workflows/pr-xplat-build-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9938220..368cabf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -29,7 +29,7 @@ jobs: steps: - run: echo "Running CodeQL for ${{ matrix.language }}" - name: Run CodeQL - uses: VolcanusLucis/.github/.github/actions/shared-codeql.yml@master + uses: VolcanusLucis/.github/.github/actions/shared-codeql@master with: language: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} diff --git a/.github/workflows/pr-xplat-build-test.yml b/.github/workflows/pr-xplat-build-test.yml index cabc459..4001198 100644 --- a/.github/workflows/pr-xplat-build-test.yml +++ b/.github/workflows/pr-xplat-build-test.yml @@ -28,7 +28,7 @@ jobs: compiler: mingw64 steps: - - uses: VolcanusLucis/.github/.github/actions/build-cmake-project-presets.yml@master + - uses: VolcanusLucis/.github/.github/actions/build-cmake-project-presets@master with: architecture: ${{ matrix.architecture }} build-tool: ${{ matrix.build-tool }}