From 0854d2fb353945b328fe9eefb4a61524da69db02 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 25 Mar 2020 15:45:48 +0100 Subject: [PATCH 1/4] Disable Boost CMake build on master in GHA --- .github/workflows/ci_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 0a3ed17..759e5cd 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -103,6 +103,8 @@ jobs: BoostCMakeBuild: runs-on: ubuntu-16.04 + # Doesn't work on master yet + if: "! endsWith(github.ref, '/master') && ! endsWith(github.base_ref, '/master')" steps: - name: Get Boost branch id: get_branch From 1c16c68d06851e509409f699e1602cfd40b30e18 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 25 Mar 2020 15:52:02 +0100 Subject: [PATCH 2/4] Limit AzP jobs --- azure-pipelines.yml | 123 +------------------------------------------- 1 file changed, 2 insertions(+), 121 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a6d941c..0517e3e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,6 +36,8 @@ pr: variables: - name: B2_VARIANT value: variant=release,debug + - name: B2_LINK + value: link=shared,static stages: @@ -52,93 +54,12 @@ stages: B2_CXXSTD: 14,17,2a CXX: g++-8 PACKAGES: g++-8 - GCC 7: - B2_TOOLSET: gcc - B2_CXXSTD: 11,14,17 - CXX: g++-7 - PACKAGES: g++-7 - GCC 6: - B2_TOOLSET: gcc - B2_CXXSTD: 11,14 - CXX: g++-6 - PACKAGES: g++-6 - GCC 5: - B2_TOOLSET: gcc - B2_CXXSTD: 11 - CXX: g++-5 - PACKAGES: g++-5 - GCC 4.9: - B2_TOOLSET: gcc - B2_CXXSTD: 03,11 - CXX: g++-4.9 - PACKAGES: g++-4.9 - GCC 4.8: - B2_TOOLSET: gcc - B2_CXXSTD: 03,11 - CXX: g++-4.8 - PACKAGES: g++-4.8 Clang 8: B2_TOOLSET: clang B2_CXXSTD: 14,17,2a CXX: clang++-8 PACKAGES: clang-8 LLVM_REPO: llvm-toolchain-xenial-8 - Clang 7: - B2_TOOLSET: clang - B2_CXXSTD: 14,17,2a - CXX: clang++-7 - PACKAGES: clang-7 - LLVM_REPO: llvm-toolchain-xenial-7 - Clang 6 libc++: - B2_TOOLSET: clang - B2_CXXSTD: 03,11,14,17,2a - B2_CXXFLAGS: -stdlib=libc++ - CXX: clang++-6.0 - PACKAGES: clang-6.0 - LLVM_REPO: llvm-toolchain-xenial-6.0 - Clang 6: - B2_TOOLSET: clang - B2_CXXSTD: 14,17,2a - CXX: clang++-6.0 - PACKAGES: clang-6.0 - LLVM_REPO: llvm-toolchain-xenial-6.0 - Clang 5: - B2_TOOLSET: clang - B2_CXXSTD: 11,14,17 - PACKAGES: clang-5.0 - CXX: clang++-5.0 - LLVM_REPO: llvm-toolchain-xenial-5.0 - Clang 4: - B2_TOOLSET: clang - B2_CXXSTD: 11,14,17 - CXX: clang++-4.0 - PACKAGES: clang-4.0 - LLVM_REPO: llvm-toolchain-xenial-4.0 - Clang 3.9: - B2_TOOLSET: clang - B2_CXXSTD: 03,11,14 - CXX: clang++-3.9 - PACKAGES: clang-3.9 - Clang 3.8: - B2_TOOLSET: clang - CXX: clang++-3.8 - B2_CXXSTD: 03,11,14 - PACKAGES: clang-3.8 - Clang 3.7: - B2_TOOLSET: clang - B2_CXXSTD: 03,11 - CXX: clang++-3.7 - PACKAGES: clang-3.7 - Clang 3.6: - B2_TOOLSET: clang - B2_CXXSTD: 03,11 - CXX: clang++-3.6 - PACKAGES: clang-3.6 - Clang 3.5: - B2_TOOLSET: clang - B2_CXXSTD: 03,11 - CXX: clang++-3.5 - PACKAGES: clang-3.5 steps: - bash: | set -e @@ -240,46 +161,6 @@ stages: B2_TOOLSET: clang B2_CXXSTD: 14,17,2a XCODE_APP: /Applications/Xcode_10.1.app - Xcode 10.0: - B2_TOOLSET: clang - B2_CXXSTD: 14,17,2a - XCODE_APP: /Applications/Xcode_10.app - Xcode 9.4.1: - B2_TOOLSET: clang - B2_CXXSTD: 11,14,17 - XCODE_APP: /Applications/Xcode_9.4.1.app - Xcode 9.4: - B2_TOOLSET: clang - B2_CXXSTD: 11,14,17 - XCODE_APP: /Applications/Xcode_9.4.app - Xcode 9.3.1: - B2_TOOLSET: clang - B2_CXXSTD: 11,14,17 - XCODE_APP: /Applications/Xcode_9.3.1.app - Xcode 9.3: - B2_TOOLSET: clang - B2_CXXSTD: 11,14 - XCODE_APP: /Applications/Xcode_9.3.app - Xcode 9.2: - B2_TOOLSET: clang - B2_CXXSTD: 11,14 - XCODE_APP: /Applications/Xcode_9.2.app - Xcode 9.1: - B2_TOOLSET: clang - B2_CXXSTD: 03,11 - XCODE_APP: /Applications/Xcode_9.1.app - Xcode 9.0.1: - B2_TOOLSET: clang - B2_CXXSTD: 03,11 - XCODE_APP: /Applications/Xcode_9.0.1.app - Xcode 9.0: - B2_TOOLSET: clang - B2_CXXSTD: 03,11 - XCODE_APP: /Applications/Xcode_9.app - Xcode 8.3.3: - B2_TOOLSET: clang - B2_CXXSTD: 03,11 - XCODE_APP: /Applications/Xcode_8.3.3.app steps: - bash: | set -e From 80241c470510ff653f5e4182ecb71eb396fbecd7 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 25 Mar 2020 16:21:12 +0100 Subject: [PATCH 3/4] Remove outdated vs2015-win2012r2 image from AzP --- azure-pipelines.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0517e3e..db6344c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -121,11 +121,6 @@ stages: #B2_CXXSTD: 14 # default B2_ADDRESS_MODEL: address-model=64,32 VM_IMAGE: 'vs2017-win2016' - VS 2015 C++14: - B2_TOOLSET: msvc-14.0 - #B2_CXXSTD: 14 # default - B2_ADDRESS_MODEL: address-model=64,32 - VM_IMAGE: 'vs2015-win2012r2' pool: vmImage: $(VM_IMAGE) From b87193c05227e8d71e3a5d7caa4c637d9da5ef9a Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 25 Mar 2020 18:51:21 +0100 Subject: [PATCH 4/4] Fix OSX build on AzP --- azure-pipelines.yml | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index db6344c..115fbc4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,14 +49,14 @@ stages: vmImage: 'ubuntu-16.04' strategy: matrix: - GCC 8: + GCC_8: B2_TOOLSET: gcc - B2_CXXSTD: 14,17,2a + B2_CXXSTD: 03,11,14,17,2a CXX: g++-8 PACKAGES: g++-8 - Clang 8: + Clang_8: B2_TOOLSET: clang - B2_CXXSTD: 14,17,2a + B2_CXXSTD: 03,11,14,17,2a CXX: clang++-8 PACKAGES: clang-8 LLVM_REPO: llvm-toolchain-xenial-8 @@ -88,35 +88,31 @@ stages: set -x displayName: 'Install' - bash: | - set -e - echo "SELF=$SELF" - echo "BOOST_ROOT=$BOOST_ROOT" - cd $BOOST_ROOT/libs/$SELF - ci/azure-pipelines/build.sh --debug-configuration + ci/azure-pipelines/build.sh displayName: 'Build' - job: 'Windows' strategy: matrix: - VS 2019 C++2a Strict: + VS_2019-CXX2a_Strict: B2_TOOLSET: msvc-14.2 B2_CXXSTD: latest # 2a B2_CXXFLAGS: cxxflags=-permissive- B2_ADDRESS_MODEL: address-model=64 VM_IMAGE: 'windows-2019' - VS 2017 C++2a Strict: + VS_2017_CXX2a_Strict: B2_TOOLSET: msvc-14.1 B2_CXXSTD: latest # 2a B2_CXXFLAGS: cxxflags=-permissive- B2_ADDRESS_MODEL: address-model=64 VM_IMAGE: 'vs2017-win2016' - VS 2017 C++17: + VS_2017_CXX17: B2_TOOLSET: msvc-14.1 B2_CXXSTD: 17 B2_ADDRESS_MODEL: address-model=64,32 VM_IMAGE: 'vs2017-win2016' - VS 2017 C++14: + VS_2017_CXX14: B2_TOOLSET: msvc-14.1 #B2_CXXSTD: 14 # default B2_ADDRESS_MODEL: address-model=64,32 @@ -149,17 +145,18 @@ stages: - job: 'macOS' pool: - vmImage: 'macOS-10.13' + vmImage: 'macOS-10.14' strategy: matrix: - Xcode 10.1: + Xcode_11_3_1: B2_TOOLSET: clang - B2_CXXSTD: 14,17,2a - XCODE_APP: /Applications/Xcode_10.1.app + B2_CXXSTD: 03,11,14,17,2a + XCODE_APP: /Applications/Xcode_11.3.1.app + B2_LINK: link=static + B2_JOBS: 3 # Workaround for https://github.com/boostorg/boost-ci/issues/50 steps: - bash: | set -e - uname -a sudo xcode-select -switch ${XCODE_APP} which clang++ @@ -179,10 +176,6 @@ stages: set -x displayName: Install - bash: | - set -e - echo "SELF=$SELF" - echo "BOOST_ROOT=$BOOST_ROOT" - cd $BOOST_ROOT/libs/$SELF - ci/azure-pipelines/build.sh --debug-configuration + ci/azure-pipelines/build.sh displayName: 'Build'