Skip to content

Commit 50fada7

Browse files
ethomsonethomson
authored
Merge pull request libgit2#6198 from libgit2/ethomson/actions
ci: improve the name in CI runs
2 parents 46885ac + 6d668ff commit 50fada7

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎.github/workflows/main.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ jobs:
2222
# with both the sha and "latest" so that the subsequent runs need not
2323
# know the sha. Only do this on CI builds (when the event is a "push")
2424
# because PR builds from forks lack permission to write packages.
25-
build_containers:
26-
name: Create docker image
25+
containers:
2726
strategy:
2827
matrix:
2928
container:
@@ -46,6 +45,7 @@ jobs:
4645
- name: centos7
4746
- name: centos8
4847
runs-on: ubuntu-latest
48+
name: "Create container: ${{ matrix.container.name }}"
4949
steps:
5050
- name: Check out repository
5151
uses: actions/checkout@v2
@@ -80,44 +80,43 @@ jobs:
8080
# and their details. Then we build either in a docker container (Linux)
8181
# or on the actual hosts (macOS, Windows).
8282
build:
83-
name: Build
84-
needs: [ build_containers ]
83+
needs: [ containers ]
8584
strategy:
8685
matrix:
8786
platform:
88-
- # Xenial, GCC, OpenSSL
87+
- name: "Linux (Xenial, GCC, OpenSSL)"
8988
container:
9089
name: xenial
9190
env:
9291
CC: gcc
9392
CMAKE_GENERATOR: Ninja
9493
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON -DDEBUG_STRICT_ALLOC=ON -DDEBUG_STRICT_OPEN=ON
9594
os: ubuntu-latest
96-
- # Xenial, GCC, mbedTLS
95+
- name: Linux (Xenial, GCC, mbedTLS)
9796
container:
9897
name: xenial
9998
env:
10099
CC: gcc
101100
CMAKE_GENERATOR: Ninja
102101
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
103102
os: ubuntu-latest
104-
- # Xenial, Clang, OpenSSL
103+
- name: "Linux (Xenial, Clang, OpenSSL)"
105104
container:
106105
name: xenial
107106
env:
108107
CC: clang
109108
CMAKE_GENERATOR: Ninja
110109
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
111110
os: ubuntu-latest
112-
- # Xenial, Clang, mbedTLS
111+
- name: "Linux (Xenial, Clang, mbedTLS)"
113112
container:
114113
name: xenial
115114
env:
116115
CC: clang
117116
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
118117
CMAKE_GENERATOR: Ninja
119118
os: ubuntu-latest
120-
- # Focal, Clang 10, mbedTLS, MemorySanitizer
119+
- name: "Linux (MemorySanitizer)"
121120
container:
122121
name: focal
123122
env:
@@ -130,7 +129,7 @@ jobs:
130129
ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
131130
UBSAN_OPTIONS: print_stacktrace=1
132131
os: ubuntu-latest
133-
- # Focal, Clang 10, OpenSSL, UndefinedBehaviorSanitizer
132+
- name: "Linux (UndefinedBehaviorSanitizer)"
134133
container:
135134
name: focal
136135
env:
@@ -143,7 +142,7 @@ jobs:
143142
ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
144143
UBSAN_OPTIONS: print_stacktrace=1
145144
os: ubuntu-latest
146-
- # Focal, Clang 10, OpenSSL, ThreadSanitizer
145+
- name: "Linux (ThreadSanitizer)"
147146
container:
148147
name: focal
149148
env:
@@ -157,7 +156,7 @@ jobs:
157156
UBSAN_OPTIONS: print_stacktrace=1
158157
TSAN_OPTIONS: suppressions=/home/libgit2/source/script/thread-sanitizer.supp second_deadlock_stack=1
159158
os: ubuntu-latest
160-
- # macOS
159+
- name: "macOS"
161160
os: macos-10.15
162161
env:
163162
CC: clang
@@ -166,23 +165,23 @@ jobs:
166165
SKIP_SSH_TESTS: true
167166
SKIP_NEGOTIATE_TESTS: true
168167
setup-script: osx
169-
- # Windows amd64 Visual Studio
168+
- name: "Windows (amd64, Visual Studio)"
170169
os: windows-2019
171170
env:
172171
ARCH: amd64
173172
CMAKE_GENERATOR: Visual Studio 16 2019
174173
CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON
175174
SKIP_SSH_TESTS: true
176175
SKIP_NEGOTIATE_TESTS: true
177-
- # Windows x86 Visual Studio
176+
- name: "Windows (x86, Visual Studio)"
178177
os: windows-2019
179178
env:
180179
ARCH: x86
181180
CMAKE_GENERATOR: Visual Studio 16 2019
182181
CMAKE_OPTIONS: -A Win32 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON
183182
SKIP_SSH_TESTS: true
184183
SKIP_NEGOTIATE_TESTS: true
185-
- # Windows amd64 mingw
184+
- name: "Windows (amd64, mingw)"
186185
os: windows-2019
187186
setup-script: mingw
188187
env:
@@ -193,7 +192,7 @@ jobs:
193192
BUILD_PATH: D:\Temp\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
194193
SKIP_SSH_TESTS: true
195194
SKIP_NEGOTIATE_TESTS: true
196-
- # Windows x86 mingw
195+
- name: "Windows (x86, mingw)"
197196
os: windows-2019
198197
setup-script: mingw
199198
env:
@@ -207,6 +206,7 @@ jobs:
207206
fail-fast: false
208207
env: ${{ matrix.platform.env }}
209208
runs-on: ${{ matrix.platform.os }}
209+
name: "Build: ${{ matrix.platform.name }}"
210210
steps:
211211
- name: Check out repository
212212
uses: actions/checkout@v2
@@ -269,7 +269,7 @@ jobs:
269269
# published to our documentation site.
270270
documentation:
271271
name: Generate documentation
272-
needs: [build_containers]
272+
needs: [ containers ]
273273
runs-on: ubuntu-latest
274274
steps:
275275
- name: Check out repository

‎.github/workflows/nightly.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,59 +15,58 @@ jobs:
1515
# targets and their details. Then we build either in a docker container
1616
# (Linux) or on the actual hosts (macOS, Windows).
1717
build:
18-
name: Build
1918
strategy:
2019
matrix:
2120
platform:
22-
- # Xenial, GCC, OpenSSL
21+
- name: Linux (Xenial, GCC, OpenSSL)
2322
container:
2423
name: xenial
2524
env:
2625
CC: gcc
2726
CMAKE_GENERATOR: Ninja
2827
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
2928
os: ubuntu-latest
30-
- # Xenial, GCC, mbedTLS
29+
- name: "Linux (Xenial, GCC, mbedTLS)"
3130
container:
3231
name: xenial
3332
env:
3433
CC: gcc
3534
CMAKE_GENERATOR: Ninja
3635
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
3736
os: ubuntu-latest
38-
- # Xenial, Clang, OpenSSL
37+
- name: "Linux (Xenial, Clang, OpenSSL)"
3938
container:
4039
name: xenial
4140
env:
4241
CC: clang
4342
CMAKE_GENERATOR: Ninja
4443
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
4544
os: ubuntu-latest
46-
- # Xenial, Clang, mbedTLS
45+
- name: "Linux (Xenial, Clang, mbedTLS)"
4746
container:
4847
name: xenial
4948
env:
5049
CC: clang
5150
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
5251
CMAKE_GENERATOR: Ninja
5352
os: ubuntu-latest
54-
- # Xenial, GCC, thread-free
53+
- name: "Linux (no threads)"
5554
container:
5655
name: xenial
5756
env:
5857
CC: gcc
5958
CMAKE_OPTIONS: -DTHREADSAFE=OFF -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
6059
CMAKE_GENERATOR: Ninja
6160
os: ubuntu-latest
62-
- # Xenial, Clang, OpenSSL (dynamically loaded)
61+
- name: "Linux (dynamically-loaded OpenSSL)"
6362
container:
6463
name: xenial
6564
env:
6665
CC: clang
6766
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
6867
CMAKE_GENERATOR: Ninja
6968
os: ubuntu-latest
70-
- # Focal, Clang 10, mbedTLS, MemorySanitizer
69+
- name: "Linux (MemorySanitizer)"
7170
container:
7271
name: focal
7372
env:
@@ -80,7 +79,7 @@ jobs:
8079
ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
8180
UBSAN_OPTIONS: print_stacktrace=1
8281
os: ubuntu-latest
83-
- # Focal, Clang 10, OpenSSL, UndefinedBehaviorSanitizer
82+
- name: "Linux (UndefinedBehaviorSanitizer)"
8483
container:
8584
name: focal
8685
env:
@@ -92,7 +91,7 @@ jobs:
9291
SKIP_NEGOTIATE_TESTS: true
9392
ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
9493
os: ubuntu-latest
95-
- # Focal, Clang 10, OpenSSL, ThreadSanitizer
94+
- name: "Linux (ThreadSanitizer)"
9695
container:
9796
name: focal
9897
env:
@@ -105,7 +104,7 @@ jobs:
105104
ASAN_SYMBOLIZER_PATH: /usr/bin/llvm-symbolizer-10
106105
TSAN_OPTIONS: suppressions=/home/libgit2/source/script/thread-sanitizer.supp second_deadlock_stack=1
107106
os: ubuntu-latest
108-
- # Focal, Clang 10, mmap emulation (NO_MMAP)
107+
- name: "Linux (no mmap)"
109108
container:
110109
name: focal
111110
env:
@@ -116,23 +115,23 @@ jobs:
116115
SKIP_SSH_TESTS: true
117116
SKIP_NEGOTIATE_TESTS: true
118117
os: ubuntu-latest
119-
- # CentOS 7
118+
- name: "Linux (CentOS 7)"
120119
container:
121120
name: centos7
122121
env:
123122
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
124123
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
125124
SKIP_NEGOTIATE_TESTS: true
126125
os: ubuntu-latest
127-
- # CentOS 7, OpenSSL (dynamically loaded)
126+
- name: "Linux (CentOS 7, dynamically-loaded OpenSSL)"
128127
container:
129128
name: centos7
130129
env:
131130
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
132131
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
133132
SKIP_NEGOTIATE_TESTS: true
134133
os: ubuntu-latest
135-
- # CentOS 8
134+
- name: "Linux (CentOS 8)"
136135
container:
137136
name: centos8
138137
env:
@@ -141,7 +140,7 @@ jobs:
141140
SKIP_NEGOTIATE_TESTS: true
142141
SKIP_SSH_TESTS: true
143142
os: ubuntu-latest
144-
- # CentOS 8, OpenSSL (dynamically loaded)
143+
- name: "Linux (CentOS 8, dynamically-loaded OpenSSL)"
145144
container:
146145
name: centos8
147146
env:
@@ -150,7 +149,7 @@ jobs:
150149
SKIP_NEGOTIATE_TESTS: true
151150
SKIP_SSH_TESTS: true
152151
os: ubuntu-latest
153-
- # macOS
152+
- name: "macOS"
154153
os: macos-10.15
155154
env:
156155
CC: clang
@@ -159,15 +158,15 @@ jobs:
159158
SKIP_SSH_TESTS: true
160159
SKIP_NEGOTIATE_TESTS: true
161160
setup-script: osx
162-
- # Windows amd64 Visual Studio
161+
- name: "Windows (amd64, Visual Studio)"
163162
os: windows-2019
164163
env:
165164
ARCH: amd64
166165
CMAKE_GENERATOR: Visual Studio 16 2019
167166
CMAKE_OPTIONS: -A x64 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON
168167
SKIP_SSH_TESTS: true
169168
SKIP_NEGOTIATE_TESTS: true
170-
- # Windows amd64 Visual Studio (NO_MMAP)
169+
- name: "Windows (no mmap)"
171170
os: windows-2019
172171
env:
173172
ARCH: amd64
@@ -176,15 +175,15 @@ jobs:
176175
CMAKE_OPTIONS: -A x64 -DDEPRECATE_HARD=ON
177176
SKIP_SSH_TESTS: true
178177
SKIP_NEGOTIATE_TESTS: true
179-
- # Windows x86 Visual Studio
178+
- name: "Windows (x86, Visual Studio)"
180179
os: windows-2019
181180
env:
182181
ARCH: x86
183182
CMAKE_GENERATOR: Visual Studio 16 2019
184183
CMAKE_OPTIONS: -A Win32 -DWIN32_LEAKCHECK=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON
185184
SKIP_SSH_TESTS: true
186185
SKIP_NEGOTIATE_TESTS: true
187-
- # Windows amd64 mingw
186+
- name: "Windows (amd64, mingw)"
188187
os: windows-2019
189188
setup-script: mingw
190189
env:
@@ -195,7 +194,7 @@ jobs:
195194
BUILD_PATH: D:\Temp\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
196195
SKIP_SSH_TESTS: true
197196
SKIP_NEGOTIATE_TESTS: true
198-
- # Windows x86 mingw
197+
- name: "Windows (x86, mingw)"
199198
os: windows-2019
200199
setup-script: mingw
201200
env:
@@ -206,7 +205,7 @@ jobs:
206205
BUILD_PATH: D:\Temp\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
207206
SKIP_SSH_TESTS: true
208207
SKIP_NEGOTIATE_TESTS: true
209-
- # Bionic, GCC, OpenSSL (dynamically loaded)
208+
- name: "Linux (Bionic, GCC, dynamically-loaded OpenSSL)"
210209
container:
211210
name: bionic
212211
dockerfile: bionic
@@ -216,7 +215,7 @@ jobs:
216215
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
217216
RUN_INVASIVE_TESTS: true
218217
os: ubuntu-latest
219-
- # Bionic, x86, Clang, OpenSSL
218+
- name: "Linux (x86, Bionic, Clang, OpenSSL)"
220219
container:
221220
name: bionic-x86
222221
dockerfile: bionic
@@ -227,7 +226,7 @@ jobs:
227226
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
228227
RUN_INVASIVE_TESTS: true
229228
os: ubuntu-latest
230-
- # Bionic, x86, GCC, OpenSSL
229+
- name: "Linux (x86, Bionic, GCC, OpenSSL)"
231230
container:
232231
name: bionic-x86
233232
dockerfile: bionic
@@ -237,7 +236,7 @@ jobs:
237236
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
238237
RUN_INVASIVE_TESTS: true
239238
os: ubuntu-latest
240-
- # Bionic, arm32, GCC, OpenSSL
239+
- name: "Linux (arm32, Bionic, GCC, OpenSSL)"
241240
container:
242241
name: bionic-arm32
243242
dockerfile: bionic
@@ -249,7 +248,7 @@ jobs:
249248
RUN_INVASIVE_TESTS: true
250249
SKIP_PROXY_TESTS: true
251250
os: ubuntu-latest
252-
- # Bionic, arm64, GCC, OpenSSL
251+
- name: "Linux (arm64, Bionic, GCC, OpenSSL)"
253252
container:
254253
name: bionic-arm64
255254
dockerfile: bionic
@@ -262,6 +261,7 @@ jobs:
262261
SKIP_PROXY_TESTS: true
263262
os: ubuntu-latest
264263
fail-fast: false
264+
name: "Build ${{ matrix.platform.name }}"
265265
env: ${{ matrix.platform.env }}
266266
runs-on: ${{ matrix.platform.os }}
267267
steps:

0 commit comments

Comments
 (0)