diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2022-10-07 22:04:55 +0200 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2022-10-08 23:49:55 +0200 |
| commit | d905de276911ee5b0dae3feab9793dcb811cf30d (patch) | |
| tree | 82c0ba21bd893e1b05081121bf75f00dbc545a62 /.cirrus.yml | |
| parent | ed5095ed94281989e103c72e032200b83be37878 (diff) | |
| download | curl-d905de276911ee5b0dae3feab9793dcb811cf30d.tar.gz | |
CI/cirrus: merge existing macOS jobs into a job matrix
Ref: #9627
Reviewed-by: Philip H.
Closes #9672
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 59dc45c85..1655444c6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -135,33 +135,19 @@ windows_task: %container_cmd% -l -c "cd $(echo '%cd%') && %make_cmd% TFLAGS='!IDN !SCP ~612 ~1056 %tests%' test-ci" macos_task: - name: macOS arm64 normal + name: macOS arm64 macos_instance: image: ghcr.io/cirruslabs/macos-ventura-xcode:latest - env: - CIRRUS_CLONE_DEPTH: 10 - MAKE_FLAGS: -j 4 - CFLAGS: "-Wno-vla -mmacosx-version-min=10.9" - - pkginstall_script: - - brew update - - echo libtool autoconf automake pkg-config | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - - brew update && for i in 1 2 3; do brew bundle install --no-lock --file /tmp/Brewfile && break || sleep 1; done - configure_script: - - autoreconf -fi - - ./configure --enable-warnings --enable-werror --without-ssl --enable-websockets - compile_script: - - make V=1 && make V=1 examples && cd tests && make V=1 - test_script: - - sudo make V=1 test-ci - install_script: - - sudo make V=1 install - -macos_task: - name: macOS arm64 debug - macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:latest + matrix: + - name: macOS arm64 normal + env: + install_packages: nghttp2 + configure: --without-ssl + - name: macOS arm64 debug + env: + install_packages: nghttp2 + configure: --without-ssl --enable-debug env: CIRRUS_CLONE_DEPTH: 10 @@ -169,12 +155,13 @@ macos_task: CFLAGS: "-Wno-vla -mmacosx-version-min=10.9" pkginstall_script: - - brew update - - echo libtool autoconf automake pkg-config nghttp2 | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile + - echo libtool autoconf automake pkg-config ${install_packages} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile - brew update && for i in 1 2 3; do brew bundle install --no-lock --file /tmp/Brewfile && break || sleep 1; done + - sudo -H python3 -m pip install --upgrade pip + - sudo -H python3 -m pip install impacket configure_script: - autoreconf -fi - - ./configure --enable-warnings --enable-werror --enable-debug --without-ssl --enable-websockets + - ./configure --enable-warnings --enable-werror --enable-websockets ${configure} compile_script: - make V=1 && make V=1 examples && cd tests && make V=1 test_script: |