From 0091d0d4d3cc84fb3e609fe6c8c9ed8b26679a6c Mon Sep 17 00:00:00 2001 From: foxtacles Date: Mon, 23 Mar 2026 15:41:02 -0700 Subject: [PATCH 1/2] Remove msys2 mingw32 CI job (#783) mingw-w64-i686-clang-tools-extra has been removed from MSYS2 repos as part of the ongoing 32-bit package phase-out. --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2ac64d5..37fef707 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,12 @@ name: CI -on: [push, pull_request] +on: + push: + branches: [master] + pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: @@ -40,7 +43,6 @@ jobs: - { name: 'MSVC (x64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64' } - { name: 'MSVC (x64 Debug)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', debug: true } - { name: 'MSVC (arm64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_arm64' } - - { name: 'msys2 mingw32', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw32', msys-env: 'mingw-w64-i686', shell: 'msys2 {0}' } - { name: 'msys2 mingw64', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' } - { name: 'macOS', os: 'macos-latest', generator: 'Ninja', dx5: false, config: true, brew: true, werror: true, clang-tidy: false } - { name: 'iOS', os: 'macos-15', generator: 'Xcode', dx5: false, config: false, brew: true, werror: true, clang-tidy: false, cmake-args: '-DCMAKE_SYSTEM_NAME=iOS', ios: true } From 6011de37da54547a89ea57abaf3271e50c2bc94b Mon Sep 17 00:00:00 2001 From: foxtacles Date: Mon, 23 Mar 2026 15:42:05 -0700 Subject: [PATCH 2/2] Add missing character name (#1751) * Add missing character name * Fix CI --- .github/workflows/analyze.yml | 5 ++++- .github/workflows/build.yml | 7 +++++-- .github/workflows/format.yml | 5 ++++- .github/workflows/naming.yml | 5 ++++- docs/savegame.ksy | 1 + 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index 2a25072a..1435c6f2 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -1,6 +1,9 @@ name: Analyze -on: [push, pull_request] +on: + push: + branches: [master] + pull_request: jobs: decomplint-isle: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4327d20a..1e9d4ae2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,9 @@ name: Build -on: [push, pull_request] +on: + push: + branches: [master] + pull_request: jobs: fetch-deps: @@ -18,7 +21,7 @@ jobs: matrix: toolchain: - { name: 'MSVC', shell: 'sh', setup-cmake: true, setup-ninja: true, setup-msvc: true } - - { name: 'msys2 mingw32', shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, clang-tidy: true, werror: true } + # - { name: 'msys2 mingw32', shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, clang-tidy: true, werror: true } # - { name: 'msys2 clang32', shell: 'msys2 {0}', msystem: clang32, msys-env: mingw-w64-clang-i686, clang-tidy: true, werror: true, no-dx5-libs: true } steps: diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index a58e8fc8..9dd3f225 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -1,6 +1,9 @@ name: Format -on: [push, pull_request] +on: + push: + branches: [master] + pull_request: jobs: clang-format: diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml index 15d57553..af0373fb 100644 --- a/.github/workflows/naming.yml +++ b/.github/workflows/naming.yml @@ -1,6 +1,9 @@ name: Naming -on: [push, pull_request] +on: + push: + branches: [master] + pull_request: jobs: ncc: diff --git a/docs/savegame.ksy b/docs/savegame.ksy index 45e16c25..54d264f0 100644 --- a/docs/savegame.ksy +++ b/docs/savegame.ksy @@ -150,6 +150,7 @@ types: doc: Snap Lockitt - id: pt type: standard_character_entry + doc: Pitt Stop - id: mg type: standard_character_entry doc: Margaret Patricia "Maggie" Post