From 98e4e70d8b810623daf65b865b81d94025116565 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Fri, 1 Oct 2021 16:44:32 +0200 Subject: [PATCH] ci: Add macos-11-arm64 (apple-clang-13) build --- Jenkinsfile | 4 ++-- test/ci/ubuntu.20.04.def | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f5cdb6fe..55a4559e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,8 +96,8 @@ pipeline{ [os: 'fedora', ver: '32', arch: 'x86_64', compiler: 'gcc-10', extra: all], [os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10', extra: all], [os: 'fedora', ver: '34', arch: 'x86_64', compiler: 'gcc-11', extra: all], - [os: 'macos', ver: '11', arch: 'x86_64', compiler: 'apple-clang-12', - extra: '-DHAS_ASIO=ON'], + [os: 'macos', ver: '11', arch: 'x86_64', compiler: 'apple-clang-12', extra: '-DHAS_ASIO=ON'], + [os: 'macos', ver: '11', arch: 'arm64', compiler: 'apple-clang-13', extra: '-DHAS_ASIO=ON'], ]) def all_debug = "${all} -DCMAKE_BUILD_TYPE=Debug" diff --git a/test/ci/ubuntu.20.04.def b/test/ci/ubuntu.20.04.def index 8408a9e8..bdc1f950 100644 --- a/test/ci/ubuntu.20.04.def +++ b/test/ci/ubuntu.20.04.def @@ -5,7 +5,7 @@ From: ubuntu:20.04 export DEBIAN_FRONTEND=noninteractive apt-get update apt-get -y upgrade - apt-get -y install ca-certificates patch cmake git libboost-dev libboost-log-dev libboost-system-dev libboost-regex-dev libboost-filesystem-dev libboost-container-dev libboost-thread-dev libboost-date-time-dev libboost-program-options-dev g++ libfmt-dev ninja-build wget libczmq-dev libxml2-utils libfabric-dev libfabric-bin libpmix-dev + apt-get -y install ca-certificates patch cmake git libboost-dev libboost-log-dev libboost-system-dev libboost-regex-dev libboost-filesystem-dev libboost-container-dev libboost-thread-dev libboost-date-time-dev libboost-program-options-dev g++ libfmt-dev ninja-build wget libczmq-dev libxml2-utils libfabric-dev libfabric-bin libpmix-dev pkg-config apt-get -y clean cd /tmp