Skip to content

Commit c4c7374

Browse files
Jj0YzL5nvJJj0YzL5nvJ
authored
CI/CD: Update 2025.5 (#47)
1 parent 12090cd commit c4c7374

File tree

2 files changed

+34
-32
lines changed

2 files changed

+34
-32
lines changed

‎.github/workflows/build.yml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,18 @@ jobs:
2626
arch: x64
2727
- cc: Clang
2828
arch: x86
29-
name: Linux / ${{ matrix.cc }} / ${{ matrix.arch }}
30-
runs-on: ubuntu-22.04
29+
name: Linux / ${{ matrix.cc }} ${{ matrix.arch }}
30+
runs-on: ubuntu-24.04
3131
steps:
3232
- uses: actions/checkout@v4
3333
- name: Get build dependencies and arrange the environment
3434
run: |
3535
git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
36-
export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
37-
export BUILD_DEPS="libsamplerate0-dev libsdl1.2-dev libsdl2-dev libspeexdsp-dev"
36+
export BUILD_DEPS="libsamplerate0-dev libsdl2-dev libspeexdsp-dev"
3837
./../mupen64plus-core/.github/workflows/scripts/ci_install_ubuntu_deps.sh ${{ matrix.arch }} ${{ matrix.cc }}
3938
- name: Build and related stuff, backup binaries
4039
run: |
41-
export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
42-
export PATH="$(pwd)/../mupen64plus-core/.github/workflows/scripts:${PATH}"
43-
export CONFIG_OVERRIDE="SDL_CONFIG="sdl-config""
44-
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
45-
export CONFIG_OVERRIDE="SDL_CONFIG="sdl2-config""
46-
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
40+
./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
4741
- name: Upload artifact
4842
if: matrix.cc == 'GCC'
4943
uses: actions/upload-artifact@v4
@@ -64,8 +58,16 @@ jobs:
6458
arch: x86
6559
cross: i686
6660
env: MINGW32
67-
name: Windows / MSYS2 ${{ matrix.cc }} / ${{ matrix.arch }}
68-
runs-on: windows-2022
61+
- cc: GCC
62+
arch: x64
63+
cross: ucrt-x86_64
64+
env: UCRT64
65+
- cc: Clang
66+
arch: x64
67+
cross: clang-x86_64
68+
env: CLANG64
69+
name: Windows ${{ matrix.arch }} / MSYS2 ${{ matrix.env }} ${{ matrix.cc }}
70+
runs-on: windows-2025
6971
defaults:
7072
run:
7173
shell: msys2 {0}
@@ -79,14 +81,13 @@ jobs:
7981
git
8082
libtool
8183
make
82-
mingw-w64-${{ matrix.cross }}-gcc
8384
mingw-w64-${{ matrix.cross }}-toolchain
84-
mingw-w64-${{ matrix.cross }}-libsamplerate
8585
mingw-w64-${{ matrix.cross }}-ntldd
8686
mingw-w64-${{ matrix.cross }}-SDL2
8787
mingw-w64-${{ matrix.cross }}-speexdsp
8888
- name: Build and related stuff, backup binaries
8989
run: |
90+
if [[ "${{ matrix.cross }}" != "i686" ]]; then pacman --noconfirm -S --needed mingw-w64-${{ matrix.cross }}-libsamplerate; fi
9091
git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
9192
./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
9293
- name: Backup dependencies, etc...
@@ -105,11 +106,11 @@ jobs:
105106
include:
106107
- toolset: v143
107108
arch: x64
108-
vs: 2022
109+
vs: 2025
109110
- toolset: v141_xp
110111
arch: x86
111112
vs: 2019
112-
name: Windows / MSVC with ${{ matrix.toolset }} / ${{ matrix.arch }}
113+
name: Windows ${{ matrix.arch }} / MSVC with ${{ matrix.toolset }}
113114
runs-on: windows-${{ matrix.vs }}
114115
defaults:
115116
run:

‎.github/workflows/schedule.yml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,19 @@ jobs:
1919
arch: x64
2020
- cc: Clang
2121
arch: x86
22-
name: Linux / ${{ matrix.cc }} / ${{ matrix.arch }}
23-
runs-on: ubuntu-22.04
22+
name: Linux / ${{ matrix.cc }} ${{ matrix.arch }}
23+
runs-on: ubuntu-24.04
2424
if: github.repository == 'mupen64plus/mupen64plus-audio-sdl'
2525
steps:
2626
- uses: actions/checkout@v4
2727
- name: Get build dependencies and arrange the environment
2828
run: |
2929
git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
30-
export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
31-
export BUILD_DEPS="libsamplerate0-dev libsdl1.2-dev libsdl2-dev libspeexdsp-dev"
30+
export BUILD_DEPS="libsamplerate0-dev libsdl2-dev libspeexdsp-dev"
3231
./../mupen64plus-core/.github/workflows/scripts/ci_install_ubuntu_deps.sh ${{ matrix.arch }} ${{ matrix.cc }}
3332
- name: Build and related stuff, backup binaries
3433
run: |
35-
export C_CLANG_SUFFIX="-15" C_GCC_SUFFIX="-12"
36-
export PATH="$(pwd)/../mupen64plus-core/.github/workflows/scripts:${PATH}"
37-
export CONFIG_OVERRIDE="SDL_CONFIG="sdl-config""
38-
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
39-
export CONFIG_OVERRIDE="SDL_CONFIG="sdl2-config""
40-
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
34+
./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
4135
- name: Upload artifact
4236
if: matrix.cc == 'GCC'
4337
uses: actions/upload-artifact@v4
@@ -58,8 +52,16 @@ jobs:
5852
arch: x86
5953
cross: i686
6054
env: MINGW32
61-
name: Windows / MSYS2 ${{ matrix.cc }} / ${{ matrix.arch }}
62-
runs-on: windows-2022
55+
- cc: GCC
56+
arch: x64
57+
cross: ucrt-x86_64
58+
env: UCRT64
59+
- cc: Clang
60+
arch: x64
61+
cross: clang-x86_64
62+
env: CLANG64
63+
name: Windows ${{ matrix.arch }} / MSYS2 ${{ matrix.env }} ${{ matrix.cc }}
64+
runs-on: windows-2025
6365
if: github.repository == 'mupen64plus/mupen64plus-audio-sdl'
6466
defaults:
6567
run:
@@ -74,14 +76,13 @@ jobs:
7476
git
7577
libtool
7678
make
77-
mingw-w64-${{ matrix.cross }}-gcc
7879
mingw-w64-${{ matrix.cross }}-toolchain
79-
mingw-w64-${{ matrix.cross }}-libsamplerate
8080
mingw-w64-${{ matrix.cross }}-ntldd
8181
mingw-w64-${{ matrix.cross }}-SDL2
8282
mingw-w64-${{ matrix.cross }}-speexdsp
8383
- name: Build and related stuff, backup binaries
8484
run: |
85+
if [[ "${{ matrix.cross }}" != "i686" ]]; then pacman --noconfirm -S --needed mingw-w64-${{ matrix.cross }}-libsamplerate; fi
8586
git clone --depth 1 https://github.com/mupen64plus/mupen64plus-core.git ../mupen64plus-core
8687
./../mupen64plus-core/.github/workflows/scripts/ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
8788
- name: Backup dependencies, etc...
@@ -100,11 +101,11 @@ jobs:
100101
include:
101102
- toolset: v143
102103
arch: x64
103-
vs: 2022
104+
vs: 2025
104105
- toolset: v141_xp
105106
arch: x86
106107
vs: 2019
107-
name: Windows / MSVC with ${{ matrix.toolset }} / ${{ matrix.arch }}
108+
name: Windows ${{ matrix.arch }} / MSVC with ${{ matrix.toolset }}
108109
runs-on: windows-${{ matrix.vs }}
109110
if: github.repository == 'mupen64plus/mupen64plus-audio-sdl'
110111
defaults:

0 commit comments

Comments
 (0)