From 19949b9a769f2e87f1d95c071690dca7bfa35324 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 4 May 2024 03:31:14 +0500 Subject: [PATCH 1/4] snd_sb.c: Fix compilation error Variable declarations, unlike statements, aren't allowed after labels (including case labels) according to the C standard, so insert a semicolon to make an empty statement that satisfies the requirement. Oddly, MSYS2/MinGW-w64 GCC, unlike other compilers, including GCC on other systems, seemed to accept them without errors... --- src/sound/snd_sb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c index 9dc7724a4..80642adbe 100644 --- a/src/sound/snd_sb.c +++ b/src/sound/snd_sb.c @@ -1292,6 +1292,7 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv) break; case 0x82: + ; /* Empty statement to make compilers happy about the following variable declaration. */ /* The Interrupt status register, addressed as register 82h on the Mixer register map, is used by the ISR to determine whether the interrupt is meant for it or for some other ISR, in which case it should chain to the previous routine. */ From 8d6ea95f1489136316deb439f88a4c2f2483b5c2 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 4 May 2024 04:19:30 +0500 Subject: [PATCH 2/4] workflows: Fix workflows not triggering when the workflow file is updated --- .github/workflows/cmake_linux.yml | 4 ++-- .github/workflows/cmake_macos.yml | 4 ++-- .github/workflows/cmake_windows_llvm.yml | 4 ++-- .github/workflows/cmake_windows_msys2.yml | 4 ++-- .github/workflows/codeql_linux.yml | 4 ++-- .github/workflows/codeql_macos.yml | 4 ++-- .github/workflows/codeql_windows_msys2.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml index 12cb21303..51e577cfd 100644 --- a/.github/workflows/cmake_linux.yml +++ b/.github/workflows/cmake_linux.yml @@ -8,7 +8,7 @@ on: - cmake/** - "**/CMakeLists.txt" - "CMakePresets.json" - - .github/workflows/cmake.yml + - .github/workflows/cmake_linux.yml - vcpkg.json - "!**/Makefile*" @@ -19,7 +19,7 @@ on: - "**/CMakeLists.txt" - "CMakePresets.json" - .github/workflows/** - - .github/workflows/cmake.yml + - .github/workflows/cmake_linux.yml - vcpkg.json - "!**/Makefile*" diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml index e51c652a4..f5233299b 100644 --- a/.github/workflows/cmake_macos.yml +++ b/.github/workflows/cmake_macos.yml @@ -8,7 +8,7 @@ on: - cmake/** - "**/CMakeLists.txt" - "CMakePresets.json" - - .github/workflows/cmake.yml + - .github/workflows/cmake_macos.yml - vcpkg.json - "!**/Makefile*" @@ -19,7 +19,7 @@ on: - "**/CMakeLists.txt" - "CMakePresets.json" - .github/workflows/** - - .github/workflows/cmake.yml + - .github/workflows/cmake_macos.yml - vcpkg.json - "!**/Makefile*" diff --git a/.github/workflows/cmake_windows_llvm.yml b/.github/workflows/cmake_windows_llvm.yml index a49f9488a..cbddf33ea 100644 --- a/.github/workflows/cmake_windows_llvm.yml +++ b/.github/workflows/cmake_windows_llvm.yml @@ -8,7 +8,7 @@ on: - cmake/** - "**/CMakeLists.txt" - "CMakePresets.json" - - .github/workflows/cmake.yml + - .github/workflows/cmake_windows_llvm.yml - vcpkg.json - "!**/Makefile*" @@ -19,7 +19,7 @@ on: - "**/CMakeLists.txt" - "CMakePresets.json" - .github/workflows/** - - .github/workflows/cmake.yml + - .github/workflows/cmake_windows_llvm.yml - vcpkg.json - "!**/Makefile*" diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml index 0ed29f0b7..21df9f00a 100644 --- a/.github/workflows/cmake_windows_msys2.yml +++ b/.github/workflows/cmake_windows_msys2.yml @@ -8,7 +8,7 @@ on: - cmake/** - "**/CMakeLists.txt" - "CMakePresets.json" - - .github/workflows/cmake.yml + - .github/workflows/cmake_windows_msys2.yml - vcpkg.json - "!**/Makefile*" @@ -19,7 +19,7 @@ on: - "**/CMakeLists.txt" - "CMakePresets.json" - .github/workflows/** - - .github/workflows/cmake.yml + - .github/workflows/cmake_windows_msys2.yml - vcpkg.json - "!**/Makefile*" diff --git a/.github/workflows/codeql_linux.yml b/.github/workflows/codeql_linux.yml index d92d11767..54f2c06e6 100644 --- a/.github/workflows/codeql_linux.yml +++ b/.github/workflows/codeql_linux.yml @@ -8,7 +8,7 @@ on: - cmake/** - "**/CMakeLists.txt" - "CMakePresets.json" - - .github/workflows/codeql.yml + - .github/workflows/codeql_linux.yml - vcpkg.json - "!**/Makefile*" @@ -19,7 +19,7 @@ on: - "**/CMakeLists.txt" - "CMakePresets.json" - .github/workflows/** - - .github/workflows/codeql.yml + - .github/workflows/codeql_linux.yml - vcpkg.json - "!**/Makefile*" diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml index cef8c4828..65633d073 100644 --- a/.github/workflows/codeql_macos.yml +++ b/.github/workflows/codeql_macos.yml @@ -8,7 +8,7 @@ on: - cmake/** - "**/CMakeLists.txt" - "CMakePresets.json" - - .github/workflows/codeql.yml + - .github/workflows/codeql_macos.yml - vcpkg.json - "!**/Makefile*" @@ -19,7 +19,7 @@ on: - "**/CMakeLists.txt" - "CMakePresets.json" - .github/workflows/** - - .github/workflows/codeql.yml + - .github/workflows/codeql_macos.yml - vcpkg.json - "!**/Makefile*" diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml index da368cd68..069d70fcc 100644 --- a/.github/workflows/codeql_windows_msys2.yml +++ b/.github/workflows/codeql_windows_msys2.yml @@ -8,7 +8,7 @@ on: - cmake/** - "**/CMakeLists.txt" - "CMakePresets.json" - - .github/workflows/codeql.yml + - .github/workflows/codeql_windows_msys2.yml - vcpkg.json - "!**/Makefile*" @@ -19,7 +19,7 @@ on: - "**/CMakeLists.txt" - "CMakePresets.json" - .github/workflows/** - - .github/workflows/codeql.yml + - .github/workflows/codeql_windows_msys2.yml - vcpkg.json - "!**/Makefile*" From 217fb9ac66461e2e292841e4ccd27336c87ecb6b Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 4 May 2024 04:08:54 +0500 Subject: [PATCH 3/4] workflows: Bump upload-artifact to v4 --- .github/workflows/cmake_linux.yml | 2 +- .github/workflows/cmake_macos.yml | 2 +- .github/workflows/cmake_windows_llvm.yml | 2 +- .github/workflows/cmake_windows_msys2.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml index 51e577cfd..04238ece0 100644 --- a/.github/workflows/cmake_linux.yml +++ b/.github/workflows/cmake_linux.yml @@ -115,7 +115,7 @@ jobs: cmake --install build - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}' path: build/artifacts/** diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml index f5233299b..5a9f31a01 100644 --- a/.github/workflows/cmake_macos.yml +++ b/.github/workflows/cmake_macos.yml @@ -120,7 +120,7 @@ jobs: cmake --install build - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}' path: build/artifacts/** diff --git a/.github/workflows/cmake_windows_llvm.yml b/.github/workflows/cmake_windows_llvm.yml index cbddf33ea..93f4db241 100644 --- a/.github/workflows/cmake_windows_llvm.yml +++ b/.github/workflows/cmake_windows_llvm.yml @@ -157,7 +157,7 @@ jobs: cmake --install build - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-LLVM-${{ matrix.target.name }}-gha${{ github.run_number }}' path: build/artifacts/** diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml index 21df9f00a..d3f679a78 100644 --- a/.github/workflows/cmake_windows_msys2.yml +++ b/.github/workflows/cmake_windows_msys2.yml @@ -138,7 +138,7 @@ jobs: run: cmake --install build - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}' path: build/artifacts/** From c1158affa3551d9df206ed2ffc9853c154908e0e Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 4 May 2024 04:09:13 +0500 Subject: [PATCH 4/4] workflows: Bump CodeQL actions to v3 --- .github/workflows/codeql_linux.yml | 4 ++-- .github/workflows/codeql_macos.yml | 4 ++-- .github/workflows/codeql_windows_msys2.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql_linux.yml b/.github/workflows/codeql_linux.yml index 54f2c06e6..73ccfb214 100644 --- a/.github/workflows/codeql_linux.yml +++ b/.github/workflows/codeql_linux.yml @@ -89,7 +89,7 @@ jobs: uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} config-file: ./.github/codeql/codeql-config.yml @@ -106,6 +106,6 @@ jobs: run: cmake --build build - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml index 65633d073..6d2c3861f 100644 --- a/.github/workflows/codeql_macos.yml +++ b/.github/workflows/codeql_macos.yml @@ -82,7 +82,7 @@ jobs: uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} config-file: ./.github/codeql/codeql-config.yml @@ -102,6 +102,6 @@ jobs: run: cmake --build build - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml index 069d70fcc..2b468f996 100644 --- a/.github/workflows/codeql_windows_msys2.yml +++ b/.github/workflows/codeql_windows_msys2.yml @@ -114,7 +114,7 @@ jobs: uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} config-file: ./.github/codeql/codeql-config.yml @@ -133,6 +133,6 @@ jobs: - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}"