mirror of
https://github.com/curl/curl.git
synced 2026-07-25 02:37:18 +03:00
GHA: fixup CM/AM order within Apple steps, move name: first, quote them
Closes #16092
This commit is contained in:
parent
7c198b59e4
commit
5ce5c62662
5 changed files with 121 additions and 121 deletions
30
.github/workflows/linux.yml
vendored
30
.github/workflows/linux.yml
vendored
|
|
@ -297,7 +297,8 @@ jobs:
|
|||
container: 'alpine:3.18'
|
||||
|
||||
steps:
|
||||
- if: matrix.build.container == null && !contains(matrix.build.name, 'i686')
|
||||
- name: 'install prereqs'
|
||||
if: matrix.build.container == null && !contains(matrix.build.name, 'i686')
|
||||
run: |
|
||||
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
|
||||
sudo apt-get update -y
|
||||
|
|
@ -307,9 +308,9 @@ jobs:
|
|||
libpsl-dev libbrotli-dev libzstd-dev \
|
||||
${{ matrix.build.install_packages }}
|
||||
python3 -m venv $HOME/venv
|
||||
name: 'install prereqs'
|
||||
|
||||
- if: contains(matrix.build.name, 'i686')
|
||||
- name: 'install prereqs'
|
||||
if: contains(matrix.build.name, 'i686')
|
||||
run: |
|
||||
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
|
||||
sudo dpkg --add-architecture i386
|
||||
|
|
@ -319,23 +320,22 @@ jobs:
|
|||
libpsl-dev:i386 libbrotli-dev:i386 libzstd-dev:i386 \
|
||||
${{ matrix.build.install_packages }}
|
||||
python3 -m venv $HOME/venv
|
||||
name: 'install prereqs'
|
||||
|
||||
- if: contains(matrix.build.install_steps, 'pytest')
|
||||
- name: 'install prereqs for pytest'
|
||||
if: contains(matrix.build.install_steps, 'pytest')
|
||||
run: |
|
||||
sudo apt-get install -y --no-install-suggests --no-install-recommends \
|
||||
apache2 apache2-dev libnghttp2-dev vsftpd
|
||||
name: 'install prereqs for pytest'
|
||||
|
||||
- if: startsWith(matrix.build.container, 'alpine')
|
||||
- name: 'install dependencies'
|
||||
if: startsWith(matrix.build.container, 'alpine')
|
||||
run: |
|
||||
apk add --no-cache build-base autoconf automake libtool perl openssl-dev libssh2-dev \
|
||||
zlib-dev brotli-dev zstd-dev libidn2-dev openldap-dev heimdal-dev libpsl-dev \
|
||||
py3-impacket py3-asn1 py3-six py3-pycryptodomex \
|
||||
perl-time-hires openssh stunnel sudo git
|
||||
name: 'install dependencies'
|
||||
|
||||
- name: 'Fix kernel mmap rnd bits'
|
||||
- name: 'fix kernel mmap rnd bits'
|
||||
# Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
|
||||
# high-entropy ASLR in much newer kernels that GitHub runners are
|
||||
# using leading to random crashes: https://reviews.llvm.org/D148280
|
||||
|
|
@ -579,7 +579,8 @@ jobs:
|
|||
cd rustls-ffi
|
||||
make DESTDIR=$HOME/rustls install
|
||||
|
||||
- if: contains(matrix.build.install_steps, 'intel')
|
||||
- name: 'install Intel compilers'
|
||||
if: contains(matrix.build.install_steps, 'intel')
|
||||
run: |
|
||||
cd /tmp
|
||||
curl -sSf --compressed https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | sudo apt-key add -
|
||||
|
|
@ -587,15 +588,14 @@ jobs:
|
|||
sudo apt install --no-install-recommends intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
|
||||
source /opt/intel/oneapi/setvars.sh
|
||||
printenv >> $GITHUB_ENV
|
||||
name: 'install Intel compilers'
|
||||
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- run: autoreconf -fi
|
||||
- name: 'autoreconf'
|
||||
if: ${{ matrix.build.configure }}
|
||||
name: 'autoreconf'
|
||||
run: autoreconf -fi
|
||||
|
||||
- name: 'configure'
|
||||
run: |
|
||||
|
|
@ -651,9 +651,9 @@ jobs:
|
|||
if: ${{ matrix.build.make-custom-target != 'tidy' }}
|
||||
run: ./src/curl -V
|
||||
|
||||
- run: cmake --install . --prefix $HOME/curl --strip
|
||||
- name: 'cmake install'
|
||||
if: ${{ matrix.build.generate }}
|
||||
name: 'cmake install'
|
||||
run: cmake --install . --prefix $HOME/curl --strip
|
||||
|
||||
- name: 'build tests'
|
||||
if: ${{ matrix.build.install_steps != 'skipall' }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue