Skip to content

Commit cf4a627

Browse files
committed
CI: two display name tweaks
- use `AM`/`CM` where missing. In GHA/linux-old and AppVeyor CI. To denote autotools and CMake, and to align with rest of the jobs. - rename `Old Linux` to `Linux Old` to align with the rest of Linux jobs on GitHub web views sorted by name. Closes curl#19316
1 parent 2e408aa commit cf4a627

2 files changed

Lines changed: 38 additions & 38 deletions

File tree

.github/workflows/linux-old.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# httrack is one of the smallest downloaders, needed to bootstrap ELTS,
1717
# and won't conflict with the curl we're building.
1818

19-
name: 'Old Linux'
19+
name: 'Linux Old'
2020

2121
'on':
2222
push:
@@ -56,7 +56,7 @@ env:
5656

5757
jobs:
5858
cmake-autotools:
59-
name: 'cmake & autotools'
59+
name: 'autotools & cmake'
6060
runs-on: 'ubuntu-latest'
6161
container: 'debian:stretch'
6262

@@ -84,93 +84,93 @@ jobs:
8484
with:
8585
persist-credentials: false
8686

87-
- name: 'cmake build-only configure (out-of-tree)'
87+
- name: 'CM build-only configure (out-of-tree)'
8888
run: |
8989
mkdir bld-1
9090
cd bld-1
9191
cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
9292
-DCURL_USE_GNUTLS=ON -DENABLE_ARES=OFF -DCURL_ZSTD=OFF -DCURL_USE_GSSAPI=OFF -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON
9393
94-
- name: 'cmake build-only build'
94+
- name: 'CM build-only build'
9595
run: VERBOSE=1 make -C bld-1 install
9696

97-
- name: 'cmake build-only curl -V'
97+
- name: 'CM build-only curl -V'
9898
run: bld-1/src/curl --disable --version
9999

100-
- name: 'cmake build-only configure log'
100+
- name: 'CM build-only configure log'
101101
if: ${{ !cancelled() }}
102102
run: cat bld-1/CMakeFiles/CMake*.log 2>/dev/null || true
103103

104-
- name: 'cmake build-only curl_config.h'
104+
- name: 'CM build-only curl_config.h'
105105
run: |
106106
echo '::group::raw'; cat bld-1/lib/curl_config.h || true; echo '::endgroup::'
107107
grep -F '#define' bld-1/lib/curl_config.h | sort || true
108108
109109
# when this job can get a libssh version 0.9.0 or later, this should get
110110
# that enabled again
111-
- name: 'cmake configure (out-of-tree, c-ares, zstd, gssapi)'
111+
- name: 'CM configure (out-of-tree, c-ares, zstd, gssapi)'
112112
run: |
113113
mkdir bld-cares
114114
cd bld-cares
115115
cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
116116
-DCURL_USE_GNUTLS=ON -DENABLE_ARES=ON -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON \
117117
-DCURL_LIBCURL_VERSIONED_SYMBOLS=ON
118118
119-
- name: 'cmake configure log'
119+
- name: 'CM configure log'
120120
if: ${{ !cancelled() }}
121121
run: cat bld-cares/CMakeFiles/CMake*.log 2>/dev/null || true
122122

123-
- name: 'cmake curl_config.h'
123+
- name: 'CM curl_config.h'
124124
run: |
125125
echo '::group::raw'; cat bld-cares/lib/curl_config.h || true; echo '::endgroup::'
126126
grep -F '#define' bld-cares/lib/curl_config.h | sort || true
127127
128-
- name: 'cmake build'
128+
- name: 'CM build'
129129
run: make -C bld-cares
130130

131-
- name: 'cmake curl -V'
131+
- name: 'CM curl -V'
132132
run: bld-cares/src/curl --disable --version
133133

134-
- name: 'cmake install'
134+
- name: 'CM install'
135135
run: make -C bld-cares install
136136

137-
- name: 'cmake build tests'
137+
- name: 'CM build tests'
138138
run: make -C bld-cares testdeps
139139

140-
- name: 'cmake run tests'
140+
- name: 'CM run tests'
141141
run: make -C bld-cares test-ci
142142

143-
- name: 'cmake build examples'
143+
- name: 'CM build examples'
144144
run: make -C bld-cares curl-examples-build
145145

146-
- name: 'autoreconf'
146+
- name: 'AM autoreconf'
147147
run: autoreconf -fi
148148

149-
- name: 'autotools configure (out-of-tree, c-ares, zstd, gssapi)'
149+
- name: 'AM configure (out-of-tree, c-ares, zstd, gssapi)'
150150
run: |
151151
mkdir bld-am
152152
cd bld-am
153153
../configure --disable-dependency-tracking --enable-unity --enable-warnings --enable-werror \
154154
--with-gnutls --enable-ares --without-libssh2 --with-zstd --with-gssapi --with-librtmp \
155155
--prefix="$PWD"/../curl-install-am
156156
157-
- name: 'autotools configure log'
157+
- name: 'AM configure log'
158158
if: ${{ !cancelled() }}
159159
run: cat bld-am/config.log 2>/dev/null || true
160160

161-
- name: 'autotools curl_config.h'
161+
- name: 'AM curl_config.h'
162162
run: |
163163
echo '::group::raw'; cat bld-am/lib/curl_config.h || true; echo '::endgroup::'
164164
grep -F '#define' bld-am/lib/curl_config.h | sort || true
165165
166-
- name: 'autotools build'
166+
- name: 'AM build'
167167
run: make -C bld-am
168168

169-
- name: 'autotools curl -V'
169+
- name: 'AM curl -V'
170170
run: bld-am/src/curl --disable --version
171171

172-
- name: 'autotools install'
172+
- name: 'AM install'
173173
run: make -C bld-am install
174174

175-
- name: 'autotools build tests'
175+
- name: 'AM build tests'
176176
run: make -C bld-am/tests all

appveyor.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,22 @@ environment:
4646

4747
# generated CMake-based Visual Studio builds
4848

49-
- job_name: 'CMake, VS2022, Release, x64, OpenSSL 3.5, Shared, Build-tests'
49+
- job_name: 'CM VS2022, Release, x64, OpenSSL 3.5, Shared, Build-tests'
5050
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
5151
PRJ_GEN: 'Visual Studio 17 2022'
5252
TARGET: '-A x64'
5353
PRJ_CFG: Release
5454
OPENSSL: 'ON'
5555
SHARED: 'ON'
56-
- job_name: 'CMake, VS2022, Release, arm64, Schannel, Static, Build-tests'
56+
- job_name: 'CM VS2022, Release, arm64, Schannel, Static, Build-tests'
5757
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
5858
PRJ_GEN: 'Visual Studio 17 2022'
5959
TARGET: '-A ARM64'
6060
PRJ_CFG: Release
6161
SCHANNEL: 'ON'
6262
DEBUG: 'OFF'
6363
CURLDEBUG: 'ON'
64-
- job_name: 'CMake, VS2010, Debug, x64, Schannel, Shared, Build-tests & examples, XP'
64+
- job_name: 'CM VS2010, Debug, x64, Schannel, Shared, Build-tests & examples, XP'
6565
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013'
6666
PRJ_GEN: 'Visual Studio 10 2010'
6767
TARGET: '-A x64'
@@ -70,46 +70,46 @@ environment:
7070
SCHANNEL: 'ON'
7171
SHARED: 'ON'
7272
EXAMPLES: 'ON'
73-
- job_name: 'CMake, VS2012, Release, x86, OpenSSL 1.1.1 + Schannel, Shared, Build-tests'
73+
- job_name: 'CM VS2012, Release, x86, OpenSSL 1.1.1 + Schannel, Shared, Build-tests'
7474
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
7575
PRJ_GEN: 'Visual Studio 11 2012'
7676
TARGET: '-A Win32'
7777
PRJ_CFG: Release
7878
OPENSSL: 'ON'
7979
SCHANNEL: 'ON'
8080
SHARED: 'ON'
81-
- job_name: 'CMake, VS2013, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
81+
- job_name: 'CM VS2013, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
8282
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
8383
PRJ_GEN: 'Visual Studio 12 2013'
8484
TARGET: '-A x64'
8585
PRJ_CFG: Debug
8686
OPENSSL: 'ON'
8787
SHARED: 'ON'
8888
TFLAGS: 'skipall'
89-
- job_name: 'CMake, VS2015, Debug, x64, OpenSSL 1.1.1, Static, Build-only'
89+
- job_name: 'CM VS2015, Debug, x64, OpenSSL 1.1.1, Static, Build-only'
9090
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
9191
PRJ_GEN: 'Visual Studio 14 2015'
9292
TARGET: '-A x64'
9393
PRJ_CFG: Debug
9494
OPENSSL: 'ON'
9595
TFLAGS: 'skipall'
96-
- job_name: 'CMake, VS2017, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
96+
- job_name: 'CM VS2017, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
9797
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017'
9898
PRJ_GEN: 'Visual Studio 15 2017'
9999
TARGET: '-A x64'
100100
PRJ_CFG: Debug
101101
OPENSSL: 'ON'
102102
SHARED: 'ON'
103103
TFLAGS: 'skipall'
104-
- job_name: 'CMake, VS2019, Debug, x64, OpenSSL 3.0 + Schannel, Shared, Build-tests'
104+
- job_name: 'CM VS2019, Debug, x64, OpenSSL 3.0 + Schannel, Shared, Build-tests'
105105
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2019'
106106
PRJ_GEN: 'Visual Studio 16 2019'
107107
TARGET: '-A x64'
108108
PRJ_CFG: Debug
109109
OPENSSL: 'ON'
110110
SCHANNEL: 'ON'
111111
SHARED: 'ON'
112-
- job_name: 'CMake, VS2022, Debug, x64, OpenSSL 3.5 + Schannel, Static, Unicode, Build-tests & examples, clang-cl'
112+
- job_name: 'CM VS2022, Debug, x64, OpenSSL 3.5 + Schannel, Static, Unicode, Build-tests & examples, clang-cl'
113113
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
114114
PRJ_GEN: 'Visual Studio 17 2022'
115115
TARGET: '-A x64'
@@ -119,14 +119,14 @@ environment:
119119
ENABLE_UNICODE: 'ON'
120120
EXAMPLES: 'ON'
121121
TOOLSET: 'ClangCl'
122-
- job_name: 'CMake, VS2022, Debug, x64, Schannel, Static, Unicode, Build-tests'
122+
- job_name: 'CM VS2022, Debug, x64, Schannel, Static, Unicode, Build-tests'
123123
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
124124
PRJ_GEN: 'Visual Studio 17 2022'
125125
TARGET: '-A x64'
126126
PRJ_CFG: Debug
127127
SCHANNEL: 'ON'
128128
ENABLE_UNICODE: 'ON'
129-
- job_name: 'CMake, VS2022, Release, x64, Schannel, Shared, Unicode, DEBUGBUILD, no-CURLDEBUG, Build-tests'
129+
- job_name: 'CM VS2022, Release, x64, Schannel, Shared, Unicode, DEBUGBUILD, no-CURLDEBUG, Build-tests'
130130
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
131131
PRJ_GEN: 'Visual Studio 17 2022'
132132
TARGET: '-A x64'
@@ -135,12 +135,12 @@ environment:
135135
ENABLE_UNICODE: 'ON'
136136
SHARED: 'ON'
137137
CURLDEBUG: 'OFF'
138-
- job_name: 'CMake, VS2022, Debug, x64, no SSL, Static, Build-tests'
138+
- job_name: 'CM VS2022, Debug, x64, no SSL, Static, Build-tests'
139139
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
140140
PRJ_GEN: 'Visual Studio 17 2022'
141141
TARGET: '-A x64'
142142
PRJ_CFG: Debug
143-
- job_name: 'CMake, VS2022, Debug, x64, no SSL, Static, HTTP only, Build-tests'
143+
- job_name: 'CM VS2022, Debug, x64, no SSL, Static, HTTP only, Build-tests'
144144
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
145145
PRJ_GEN: 'Visual Studio 17 2022'
146146
TARGET: '-A x64'
@@ -149,7 +149,7 @@ environment:
149149

150150
# generated VisualStudioSolution-based builds
151151

152-
- job_name: 'VisualStudioSolution, VS2013, Debug, x86, Schannel, Build-only'
152+
- job_name: 'VisualStudioSolution VS2013, Debug, x86, Schannel, Build-only'
153153
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
154154
BUILD_SYSTEM: VisualStudioSolution
155155
PRJ_CFG: 'DLL Debug - DLL Windows SSPI - DLL WinIDN'

0 commit comments

Comments
 (0)