mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-09 19:10:38 +00:00
Change: [CI] Use a custom name for matrix runs (#10723)
By default, GitHub adds all arguments of the matrix between (). This is fine sometimes, but in other times it becomes a very lengthy line. With this commit, we decide what is between those (), making it a lot more readable.
This commit is contained in:
parent
f5fad88723
commit
a255b61514
37
.github/workflows/ci-build.yml
vendored
37
.github/workflows/ci-build.yml
vendored
@ -69,24 +69,29 @@ jobs:
|
|||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
|
|
||||||
linux:
|
linux:
|
||||||
name: Linux
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- compiler: clang
|
- name: Clang
|
||||||
|
compiler: clang
|
||||||
cxxcompiler: clang++
|
cxxcompiler: clang++
|
||||||
libsdl: libsdl2-dev
|
libraries: libsdl2-dev
|
||||||
- compiler: gcc
|
- name: GCC - SDL2
|
||||||
|
compiler: gcc
|
||||||
cxxcompiler: g++
|
cxxcompiler: g++
|
||||||
libsdl: libsdl2-dev
|
libraries: libsdl2-dev
|
||||||
- compiler: gcc
|
- name: GCC - SDL1.2
|
||||||
|
compiler: gcc
|
||||||
cxxcompiler: g++
|
cxxcompiler: g++
|
||||||
libsdl: libsdl1.2-dev
|
libraries: libsdl1.2-dev
|
||||||
- compiler: gcc
|
- name: GCC - Dedicated
|
||||||
|
compiler: gcc
|
||||||
cxxcompiler: g++
|
cxxcompiler: g++
|
||||||
extra-cmake-parameters: -DOPTION_DEDICATED=ON -DCMAKE_CXX_FLAGS_INIT="-DRANDOM_DEBUG"
|
extra-cmake-parameters: -DOPTION_DEDICATED=ON -DCMAKE_CXX_FLAGS_INIT="-DRANDOM_DEBUG"
|
||||||
|
# Compile without SDL / SDL2, as that should compile fine too.
|
||||||
|
|
||||||
|
name: Linux (${{ matrix.name }})
|
||||||
|
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
env:
|
env:
|
||||||
@ -111,7 +116,7 @@ jobs:
|
|||||||
libicu-dev \
|
libicu-dev \
|
||||||
liblzma-dev \
|
liblzma-dev \
|
||||||
liblzo2-dev \
|
liblzo2-dev \
|
||||||
${{ matrix.libsdl }} \
|
${{ matrix.libraries }} \
|
||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
# EOF
|
# EOF
|
||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
@ -156,8 +161,6 @@ jobs:
|
|||||||
ctest -j $(nproc) --timeout 120
|
ctest -j $(nproc) --timeout 120
|
||||||
|
|
||||||
macos:
|
macos:
|
||||||
name: Mac OS
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@ -165,6 +168,8 @@ jobs:
|
|||||||
- arch: x64
|
- arch: x64
|
||||||
full_arch: x86_64
|
full_arch: x86_64
|
||||||
|
|
||||||
|
name: Mac OS (${{ matrix.arch }})
|
||||||
|
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
env:
|
env:
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.13
|
MACOSX_DEPLOYMENT_TARGET: 10.13
|
||||||
@ -247,14 +252,14 @@ jobs:
|
|||||||
ctest -j $(sysctl -n hw.logicalcpu) --timeout 120
|
ctest -j $(sysctl -n hw.logicalcpu) --timeout 120
|
||||||
|
|
||||||
windows:
|
windows:
|
||||||
name: Windows
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest, windows-2019]
|
os: [windows-latest, windows-2019]
|
||||||
arch: [x86, x64]
|
arch: [x86, x64]
|
||||||
|
|
||||||
|
name: Windows (${{ matrix.os }} / ${{ matrix.arch }})
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@ -338,8 +343,6 @@ jobs:
|
|||||||
|
|
||||||
|
|
||||||
msys2:
|
msys2:
|
||||||
name: msys2
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@ -349,6 +352,8 @@ jobs:
|
|||||||
- msystem: MINGW32
|
- msystem: MINGW32
|
||||||
arch: i686
|
arch: i686
|
||||||
|
|
||||||
|
name: MinGW (${{ matrix.arch }})
|
||||||
|
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
4
.github/workflows/release-windows.yml
vendored
4
.github/workflows/release-windows.yml
vendored
@ -9,8 +9,6 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
windows:
|
windows:
|
||||||
name: Windows
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@ -22,6 +20,8 @@ jobs:
|
|||||||
- arch: arm64
|
- arch: arm64
|
||||||
host: x64_arm64
|
host: x64_arm64
|
||||||
|
|
||||||
|
name: Windows (${{ matrix.arch }}})
|
||||||
|
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
Loading…
Reference in New Issue
Block a user