Skip to content

Commit e8950b0

Browse files
committed
CI: Build MacOS 10.15 and name things more properly
1 parent ba3def0 commit e8950b0

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

.github/workflows/cmake.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222

2323
build-ubuntu:
2424

25-
name: Ubuntu (${{ matrix.os }}, ${{ matrix.portal.name }}, ${{ matrix.compiler.c }}, C++${{ matrix.cppstd }})
26-
runs-on: ${{ matrix.os }}
25+
name: Ubuntu ${{ matrix.os.name }} - ${{ matrix.compiler.name }}, ${{ matrix.portal.name }}, C++${{ matrix.cppstd }}
26+
runs-on: ${{ matrix.os.label }}
2727

2828
strategy:
2929
matrix:
30-
os: [ubuntu-latest, ubuntu-18.04]
30+
os: [ {label: ubuntu-latest, name: latest}, {label: ubuntu-18.04, name: 18.04} ]
3131
portal: [ {flag: OFF, dep: libgtk-3-dev, name: GTK}, {flag: ON, dep: libdbus-1-dev, name: Portal} ] # The NFD_PORTAL setting defaults to OFF (i.e. uses GTK)
32-
compiler: [ {c: gcc, cpp: g++}, {c: clang, cpp: clang++} ] # The default compiler is gcc/g++
32+
compiler: [ {c: gcc, cpp: g++, name: GCC}, {c: clang, cpp: clang++, name: Clang} ] # The default compiler is gcc/g++
3333
cppstd: [23, 11]
3434

3535
steps:
@@ -44,15 +44,19 @@ jobs:
4444
- name: Upload test binaries
4545
uses: actions/upload-artifact@v2
4646
with:
47-
name: ${{ matrix.os }} - ${{ matrix.compiler.c }}
47+
name: Ubuntu ${{ matrix.os.name }} - ${{ matrix.compiler.name }}, ${{ matrix.portal.name }}, C++${{ matrix.cppstd }}
4848
path: |
4949
build/src/libnfd.a
5050
build/test/test_*
5151
5252
build-macos-clang:
5353

54-
name: MacOS latest - Clang
55-
runs-on: macos-latest
54+
name: MacOS ${{ matrix.os.name }} - Clang
55+
runs-on: ${{ matrix.os.label }}
56+
57+
strategy:
58+
matrix:
59+
os: [ {label: macos-latest, name: latest}, {label: macos-10.15, name: 10.15} ]
5660

5761
steps:
5862
- name: Checkout
@@ -64,7 +68,7 @@ jobs:
6468
- name: Upload test binaries
6569
uses: actions/upload-artifact@v2
6670
with:
67-
name: MacOS latest - Clang
71+
name: MacOS ${{ matrix.os.name }} - Clang
6872
path: |
6973
build/src/libnfd.a
7074
build/test/test_*

0 commit comments

Comments
 (0)