Skip to content

Commit 62b096e

Browse files
committed
CI: linux workflows to run under ubuntu-latest.
1 parent e368e56 commit 62b096e

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ jobs:
1919
- { name: Windows (mingw32+autotools), os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, shared: 1, static: 1 }
2020
- { name: Windows (mingw64+CMake), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, shared: 1, static: 0,
2121
cmake: '-DSDL2MIXER_VENDORED=OFF -G "Ninja Multi-Config"' }
22-
- { name: Linux (autotools), os: ubuntu-20.04, shell: sh, shared: 1, static: 1}
23-
- { name: Linux (CMake), os: ubuntu-20.04, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
24-
- { name: 'Linux (CMake, static)', os: ubuntu-20.04, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -DBUILD_SHARED_LIBS=OFF -GNinja', shared: 0, static: 1 }
25-
- { name: Macos (autotools), os: macos-latest, shell: sh, shared: 1, static: 1 }
26-
- { name: Macos (CMake), os: macos-latest, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
27-
22+
- { name: Linux (autotools), os: ubuntu-latest, shell: sh, shared: 1, static: 1}
23+
- { name: Linux (CMake), os: ubuntu-latest, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
24+
- { name: 'Linux (CMake, static)', os: ubuntu-latest, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -DBUILD_SHARED_LIBS=OFF -GNinja', shared: 0, static: 1 }
25+
- { name: Macos (autotools), os: macos-latest, shell: sh, shared: 1, static: 1 }
26+
- { name: Macos (CMake), os: macos-latest, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
2827

2928
steps:
3029
- name: Set up MSYS2

0 commit comments

Comments
 (0)