mirror of
https://github.com/curl/curl.git
synced 2026-05-30 06:17:28 +03:00
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 #19316
This commit is contained in:
parent
2e408aa5cc
commit
cf4a62725d
2 changed files with 38 additions and 38 deletions
48
.github/workflows/linux-old.yml
vendored
48
.github/workflows/linux-old.yml
vendored
|
|
@ -16,7 +16,7 @@
|
|||
# httrack is one of the smallest downloaders, needed to bootstrap ELTS,
|
||||
# and won't conflict with the curl we're building.
|
||||
|
||||
name: 'Old Linux'
|
||||
name: 'Linux Old'
|
||||
|
||||
'on':
|
||||
push:
|
||||
|
|
@ -56,7 +56,7 @@ env:
|
|||
|
||||
jobs:
|
||||
cmake-autotools:
|
||||
name: 'cmake & autotools'
|
||||
name: 'autotools & cmake'
|
||||
runs-on: 'ubuntu-latest'
|
||||
container: 'debian:stretch'
|
||||
|
||||
|
|
@ -84,31 +84,31 @@ jobs:
|
|||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: 'cmake build-only configure (out-of-tree)'
|
||||
- name: 'CM build-only configure (out-of-tree)'
|
||||
run: |
|
||||
mkdir bld-1
|
||||
cd bld-1
|
||||
cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
|
||||
-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
|
||||
|
||||
- name: 'cmake build-only build'
|
||||
- name: 'CM build-only build'
|
||||
run: VERBOSE=1 make -C bld-1 install
|
||||
|
||||
- name: 'cmake build-only curl -V'
|
||||
- name: 'CM build-only curl -V'
|
||||
run: bld-1/src/curl --disable --version
|
||||
|
||||
- name: 'cmake build-only configure log'
|
||||
- name: 'CM build-only configure log'
|
||||
if: ${{ !cancelled() }}
|
||||
run: cat bld-1/CMakeFiles/CMake*.log 2>/dev/null || true
|
||||
|
||||
- name: 'cmake build-only curl_config.h'
|
||||
- name: 'CM build-only curl_config.h'
|
||||
run: |
|
||||
echo '::group::raw'; cat bld-1/lib/curl_config.h || true; echo '::endgroup::'
|
||||
grep -F '#define' bld-1/lib/curl_config.h | sort || true
|
||||
|
||||
# when this job can get a libssh version 0.9.0 or later, this should get
|
||||
# that enabled again
|
||||
- name: 'cmake configure (out-of-tree, c-ares, zstd, gssapi)'
|
||||
- name: 'CM configure (out-of-tree, c-ares, zstd, gssapi)'
|
||||
run: |
|
||||
mkdir bld-cares
|
||||
cd bld-cares
|
||||
|
|
@ -116,37 +116,37 @@ jobs:
|
|||
-DCURL_USE_GNUTLS=ON -DENABLE_ARES=ON -DCURL_USE_GSSAPI=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON \
|
||||
-DCURL_LIBCURL_VERSIONED_SYMBOLS=ON
|
||||
|
||||
- name: 'cmake configure log'
|
||||
- name: 'CM configure log'
|
||||
if: ${{ !cancelled() }}
|
||||
run: cat bld-cares/CMakeFiles/CMake*.log 2>/dev/null || true
|
||||
|
||||
- name: 'cmake curl_config.h'
|
||||
- name: 'CM curl_config.h'
|
||||
run: |
|
||||
echo '::group::raw'; cat bld-cares/lib/curl_config.h || true; echo '::endgroup::'
|
||||
grep -F '#define' bld-cares/lib/curl_config.h | sort || true
|
||||
|
||||
- name: 'cmake build'
|
||||
- name: 'CM build'
|
||||
run: make -C bld-cares
|
||||
|
||||
- name: 'cmake curl -V'
|
||||
- name: 'CM curl -V'
|
||||
run: bld-cares/src/curl --disable --version
|
||||
|
||||
- name: 'cmake install'
|
||||
- name: 'CM install'
|
||||
run: make -C bld-cares install
|
||||
|
||||
- name: 'cmake build tests'
|
||||
- name: 'CM build tests'
|
||||
run: make -C bld-cares testdeps
|
||||
|
||||
- name: 'cmake run tests'
|
||||
- name: 'CM run tests'
|
||||
run: make -C bld-cares test-ci
|
||||
|
||||
- name: 'cmake build examples'
|
||||
- name: 'CM build examples'
|
||||
run: make -C bld-cares curl-examples-build
|
||||
|
||||
- name: 'autoreconf'
|
||||
- name: 'AM autoreconf'
|
||||
run: autoreconf -fi
|
||||
|
||||
- name: 'autotools configure (out-of-tree, c-ares, zstd, gssapi)'
|
||||
- name: 'AM configure (out-of-tree, c-ares, zstd, gssapi)'
|
||||
run: |
|
||||
mkdir bld-am
|
||||
cd bld-am
|
||||
|
|
@ -154,23 +154,23 @@ jobs:
|
|||
--with-gnutls --enable-ares --without-libssh2 --with-zstd --with-gssapi --with-librtmp \
|
||||
--prefix="$PWD"/../curl-install-am
|
||||
|
||||
- name: 'autotools configure log'
|
||||
- name: 'AM configure log'
|
||||
if: ${{ !cancelled() }}
|
||||
run: cat bld-am/config.log 2>/dev/null || true
|
||||
|
||||
- name: 'autotools curl_config.h'
|
||||
- name: 'AM curl_config.h'
|
||||
run: |
|
||||
echo '::group::raw'; cat bld-am/lib/curl_config.h || true; echo '::endgroup::'
|
||||
grep -F '#define' bld-am/lib/curl_config.h | sort || true
|
||||
|
||||
- name: 'autotools build'
|
||||
- name: 'AM build'
|
||||
run: make -C bld-am
|
||||
|
||||
- name: 'autotools curl -V'
|
||||
- name: 'AM curl -V'
|
||||
run: bld-am/src/curl --disable --version
|
||||
|
||||
- name: 'autotools install'
|
||||
- name: 'AM install'
|
||||
run: make -C bld-am install
|
||||
|
||||
- name: 'autotools build tests'
|
||||
- name: 'AM build tests'
|
||||
run: make -C bld-am/tests all
|
||||
|
|
|
|||
28
appveyor.yml
28
appveyor.yml
|
|
@ -46,14 +46,14 @@ environment:
|
|||
|
||||
# generated CMake-based Visual Studio builds
|
||||
|
||||
- job_name: 'CMake, VS2022, Release, x64, OpenSSL 3.5, Shared, Build-tests'
|
||||
- job_name: 'CM VS2022, Release, x64, OpenSSL 3.5, Shared, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
|
||||
PRJ_GEN: 'Visual Studio 17 2022'
|
||||
TARGET: '-A x64'
|
||||
PRJ_CFG: Release
|
||||
OPENSSL: 'ON'
|
||||
SHARED: 'ON'
|
||||
- job_name: 'CMake, VS2022, Release, arm64, Schannel, Static, Build-tests'
|
||||
- job_name: 'CM VS2022, Release, arm64, Schannel, Static, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
|
||||
PRJ_GEN: 'Visual Studio 17 2022'
|
||||
TARGET: '-A ARM64'
|
||||
|
|
@ -61,7 +61,7 @@ environment:
|
|||
SCHANNEL: 'ON'
|
||||
DEBUG: 'OFF'
|
||||
CURLDEBUG: 'ON'
|
||||
- job_name: 'CMake, VS2010, Debug, x64, Schannel, Shared, Build-tests & examples, XP'
|
||||
- job_name: 'CM VS2010, Debug, x64, Schannel, Shared, Build-tests & examples, XP'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013'
|
||||
PRJ_GEN: 'Visual Studio 10 2010'
|
||||
TARGET: '-A x64'
|
||||
|
|
@ -70,7 +70,7 @@ environment:
|
|||
SCHANNEL: 'ON'
|
||||
SHARED: 'ON'
|
||||
EXAMPLES: 'ON'
|
||||
- job_name: 'CMake, VS2012, Release, x86, OpenSSL 1.1.1 + Schannel, Shared, Build-tests'
|
||||
- job_name: 'CM VS2012, Release, x86, OpenSSL 1.1.1 + Schannel, Shared, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
|
||||
PRJ_GEN: 'Visual Studio 11 2012'
|
||||
TARGET: '-A Win32'
|
||||
|
|
@ -78,7 +78,7 @@ environment:
|
|||
OPENSSL: 'ON'
|
||||
SCHANNEL: 'ON'
|
||||
SHARED: 'ON'
|
||||
- job_name: 'CMake, VS2013, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
|
||||
- job_name: 'CM VS2013, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
|
||||
PRJ_GEN: 'Visual Studio 12 2013'
|
||||
TARGET: '-A x64'
|
||||
|
|
@ -86,14 +86,14 @@ environment:
|
|||
OPENSSL: 'ON'
|
||||
SHARED: 'ON'
|
||||
TFLAGS: 'skipall'
|
||||
- job_name: 'CMake, VS2015, Debug, x64, OpenSSL 1.1.1, Static, Build-only'
|
||||
- job_name: 'CM VS2015, Debug, x64, OpenSSL 1.1.1, Static, Build-only'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
|
||||
PRJ_GEN: 'Visual Studio 14 2015'
|
||||
TARGET: '-A x64'
|
||||
PRJ_CFG: Debug
|
||||
OPENSSL: 'ON'
|
||||
TFLAGS: 'skipall'
|
||||
- job_name: 'CMake, VS2017, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
|
||||
- job_name: 'CM VS2017, Debug, x64, OpenSSL 1.1.1, Shared, Build-only'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017'
|
||||
PRJ_GEN: 'Visual Studio 15 2017'
|
||||
TARGET: '-A x64'
|
||||
|
|
@ -101,7 +101,7 @@ environment:
|
|||
OPENSSL: 'ON'
|
||||
SHARED: 'ON'
|
||||
TFLAGS: 'skipall'
|
||||
- job_name: 'CMake, VS2019, Debug, x64, OpenSSL 3.0 + Schannel, Shared, Build-tests'
|
||||
- job_name: 'CM VS2019, Debug, x64, OpenSSL 3.0 + Schannel, Shared, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2019'
|
||||
PRJ_GEN: 'Visual Studio 16 2019'
|
||||
TARGET: '-A x64'
|
||||
|
|
@ -109,7 +109,7 @@ environment:
|
|||
OPENSSL: 'ON'
|
||||
SCHANNEL: 'ON'
|
||||
SHARED: 'ON'
|
||||
- job_name: 'CMake, VS2022, Debug, x64, OpenSSL 3.5 + Schannel, Static, Unicode, Build-tests & examples, clang-cl'
|
||||
- job_name: 'CM VS2022, Debug, x64, OpenSSL 3.5 + Schannel, Static, Unicode, Build-tests & examples, clang-cl'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
|
||||
PRJ_GEN: 'Visual Studio 17 2022'
|
||||
TARGET: '-A x64'
|
||||
|
|
@ -119,14 +119,14 @@ environment:
|
|||
ENABLE_UNICODE: 'ON'
|
||||
EXAMPLES: 'ON'
|
||||
TOOLSET: 'ClangCl'
|
||||
- job_name: 'CMake, VS2022, Debug, x64, Schannel, Static, Unicode, Build-tests'
|
||||
- job_name: 'CM VS2022, Debug, x64, Schannel, Static, Unicode, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
|
||||
PRJ_GEN: 'Visual Studio 17 2022'
|
||||
TARGET: '-A x64'
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: 'ON'
|
||||
ENABLE_UNICODE: 'ON'
|
||||
- job_name: 'CMake, VS2022, Release, x64, Schannel, Shared, Unicode, DEBUGBUILD, no-CURLDEBUG, Build-tests'
|
||||
- job_name: 'CM VS2022, Release, x64, Schannel, Shared, Unicode, DEBUGBUILD, no-CURLDEBUG, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
|
||||
PRJ_GEN: 'Visual Studio 17 2022'
|
||||
TARGET: '-A x64'
|
||||
|
|
@ -135,12 +135,12 @@ environment:
|
|||
ENABLE_UNICODE: 'ON'
|
||||
SHARED: 'ON'
|
||||
CURLDEBUG: 'OFF'
|
||||
- job_name: 'CMake, VS2022, Debug, x64, no SSL, Static, Build-tests'
|
||||
- job_name: 'CM VS2022, Debug, x64, no SSL, Static, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
|
||||
PRJ_GEN: 'Visual Studio 17 2022'
|
||||
TARGET: '-A x64'
|
||||
PRJ_CFG: Debug
|
||||
- job_name: 'CMake, VS2022, Debug, x64, no SSL, Static, HTTP only, Build-tests'
|
||||
- job_name: 'CM VS2022, Debug, x64, no SSL, Static, HTTP only, Build-tests'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
|
||||
PRJ_GEN: 'Visual Studio 17 2022'
|
||||
TARGET: '-A x64'
|
||||
|
|
@ -149,7 +149,7 @@ environment:
|
|||
|
||||
# generated VisualStudioSolution-based builds
|
||||
|
||||
- job_name: 'VisualStudioSolution, VS2013, Debug, x86, Schannel, Build-only'
|
||||
- job_name: 'VisualStudioSolution VS2013, Debug, x86, Schannel, Build-only'
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
|
||||
BUILD_SYSTEM: VisualStudioSolution
|
||||
PRJ_CFG: 'DLL Debug - DLL Windows SSPI - DLL WinIDN'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue