From 1f89d622e3755d472232591ee5a341564af85d91 Mon Sep 17 00:00:00 2001 From: Dirk Stolle Date: Fri, 12 Aug 2022 09:21:13 +0200 Subject: [PATCH] ci: replace macOS 10.15 with macOS 11 in CI pipelines (#717) * ci: replace macOS 10.15 with macOS 11 in CI workflow GitHub started the deprecation process for macOS 10.15 runners on 2022-05-31, and macOS 10.15 will be completely unsupported by 2022-08-30 (if things proceed as planned). See for more information on the removal of the macOS 10.15 images. This issue already hit us during the build for PR #716, because at that time there was a scheduled brownout for macOS 10.15 builds to raise awareness of the upcoming removal. * ci: remove Azure pipeline build configuration See . --- .azure-pipelines.yml | 71 ------------------- .ci/azure-pipelines/steps-check-cmake.yml | 9 --- .../steps-cmake-build-and-test.yml | 51 ------------- .ci/azure-pipelines/steps-install-boost.yml | 41 ----------- .ci/azure-pipelines/steps-install-conan.yml | 17 ----- .ci/azure-pipelines/steps-install-gcc.yml | 18 ----- .github/workflows/ci.yml | 2 +- README.md | 8 +-- 8 files changed, 5 insertions(+), 212 deletions(-) delete mode 100644 .azure-pipelines.yml delete mode 100644 .ci/azure-pipelines/steps-check-cmake.yml delete mode 100644 .ci/azure-pipelines/steps-cmake-build-and-test.yml delete mode 100644 .ci/azure-pipelines/steps-install-boost.yml delete mode 100644 .ci/azure-pipelines/steps-install-conan.yml delete mode 100644 .ci/azure-pipelines/steps-install-gcc.yml diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml deleted file mode 100644 index 0a5e394f5d..0000000000 --- a/.azure-pipelines.yml +++ /dev/null @@ -1,71 +0,0 @@ -# Azure Pipelines for Boost.GIL -# -# Copyright 2018-2019 Mateusz Loskot -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) -# -variables: - #system.debug: true - configuration: release - -trigger: - - master - - develop - - azure-pipelines - - ml/* - -jobs: - - job: 'ubuntu1804_gcc6_cxx14_cmake' - pool: - vmImage: 'ubuntu-18.04' - steps: - - template: .ci/azure-pipelines/steps-install-gcc.yml - parameters: - major_version: '6' - - script: which g++ && g++ --version - displayName: 'Check GCC' - - template: .ci/azure-pipelines/steps-check-cmake.yml - - script: | - sudo -E apt-get update - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install libpng-dev libjpeg-dev libtiff5-dev libraw-dev - displayName: 'Install dependencies' - - template: .ci/azure-pipelines/steps-install-boost.yml - - template: .ci/azure-pipelines/steps-cmake-build-and-test.yml - parameters: - cxxver: '14' - - - job: 'ubuntu1804_gcc8_cxx14_cmake' - pool: - vmImage: 'ubuntu-18.04' - steps: - - template: .ci/azure-pipelines/steps-install-gcc.yml - parameters: - major_version: '8' - - script: which g++ && g++ --version - displayName: 'Check GCC' - - template: .ci/azure-pipelines/steps-check-cmake.yml - - script: | - sudo -E apt-get update - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install libpng-dev libjpeg-dev libtiff5-dev libraw-dev - displayName: 'Install dependencies' - - template: .ci/azure-pipelines/steps-install-boost.yml - - template: .ci/azure-pipelines/steps-cmake-build-and-test.yml - parameters: - cxxver: '14' - - - job: 'macos1015_xcode11_cmake' - pool: - vmImage: 'macOS-10.15' - steps: - - script: which clang++ && clang++ --version - displayName: 'Check clang' - - template: .ci/azure-pipelines/steps-check-cmake.yml - - template: .ci/azure-pipelines/steps-install-conan.yml - parameters: - python: python3 - - template: .ci/azure-pipelines/steps-install-boost.yml - parameters: - toolset: darwin - - template: .ci/azure-pipelines/steps-cmake-build-and-test.yml - parameters: - use_conan: 'ON' diff --git a/.ci/azure-pipelines/steps-check-cmake.yml b/.ci/azure-pipelines/steps-check-cmake.yml deleted file mode 100644 index 8b4cd9109a..0000000000 --- a/.ci/azure-pipelines/steps-check-cmake.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Azure Pipelines for Boost.GIL -# -# Copyright 2018-2019 Mateusz Loskot -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) -# -steps: - - script: cmake --version - displayName: 'Check CMake' diff --git a/.ci/azure-pipelines/steps-cmake-build-and-test.yml b/.ci/azure-pipelines/steps-cmake-build-and-test.yml deleted file mode 100644 index a4454faaf0..0000000000 --- a/.ci/azure-pipelines/steps-cmake-build-and-test.yml +++ /dev/null @@ -1,51 +0,0 @@ -# Azure Pipelines for Boost.GIL -# -# Copyright 2018-2019 Mateusz Loskot -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) -# -parameters: - # defaults, if not specified - configuration: 'Release' - cxxver: '14' - enable_ext_io: 'OFF' - enable_ext_numeric: 'ON' - enable_ext_toolbox: 'ON' - use_conan: 'OFF' - -steps: - - script: | - export BOOST_ROOT=$(Build.SourcesDirectory)/boost-root - export BOOST_INCLUDEDIR=$BOOST_ROOT - export BOOST_LIBRARYDIR=$BOOST_ROOT/lib - cmake -H. -B_build -DCMAKE_BUILD_TYPE=${{ parameters.configuration }} -DCMAKE_CXX_STANDARD=${{ parameters.cxxver }} -DCMAKE_VERBOSE_MAKEFILE=ON -DBoost_DEBUG=ON -DBoost_NO_SYSTEM_PATHS=ON -DBOOST_GIL_USE_CONAN=${{ parameters.use_conan }} -DBOOST_GIL_ENABLE_EXT_IO=${{ parameters.enable_ext_io }} -DBOOST_GIL_ENABLE_EXT_NUMERIC=${{ parameters.enable_ext_numeric }} -DBOOST_GIL_ENABLE_EXT_TOOLBOX=${{ parameters.enable_ext_toolbox }} - workingDirectory: $(Build.SourcesDirectory)/boost-root/libs/gil - displayName: 'Run CMake to configure build on Unix' - condition: ne(variables['Agent.OS'], 'Windows_NT') - - - script: | - set BOOST_ROOT=$(Build.SourcesDirectory)\boost-root - set BOOST_INCLUDEDIR=%BOOST_ROOT% - set BOOST_LIBRARYDIR=%BOOST_ROOT%\lib - cmake -H. -B_build -DCMAKE_BUILD_TYPE=${{ parameters.configuration }} -DCMAKE_CXX_STANDARD=${{ parameters.cxxver }} -DCMAKE_VERBOSE_MAKEFILE=ON -DBoost_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS="1.70;1.71" -DBoost_ARCHITECTURE=-x32 -DBoost_NO_SYSTEM_PATHS=ON -DBOOST_GIL_USE_CONAN=${{ parameters.use_conan }} -DBOOST_GIL_ENABLE_EXT_IO=${{ parameters.enable_ext_io }} -DBOOST_GIL_ENABLE_EXT_NUMERIC=${{ parameters.enable_ext_numeric }} -DBOOST_GIL_ENABLE_EXT_TOOLBOX=${{ parameters.enable_ext_toolbox }} - workingDirectory: $(Build.SourcesDirectory)/boost-root/libs/gil - displayName: 'Run CMake to configure build on Windows' - condition: eq(variables['Agent.OS'], 'Windows_NT') - - - script: cmake --build _build --config ${{ parameters.configuration }} -j 4 - workingDirectory: $(Build.SourcesDirectory)/boost-root/libs/gil - displayName: 'Run CMake to build' - - - script: cd _build && ctest -V --output-on-failure --build-config ${{ parameters.configuration }} - workingDirectory: $(Build.SourcesDirectory)/boost-root/libs/gil - displayName: 'Run CTest to test' - condition: ne(variables['Agent.OS'], 'Darwin') - - - script: | - # Set DYLD_FALLBACK_LIBRARY_PATH to avoid 'dyld: Library not loaded: libboost_*.dylib' error - export DYLD_FALLBACK_LIBRARY_PATH=$(Build.SourcesDirectory)/boost-root/stage/lib:$DYLD_FALLBACK_LIBRARY_PATH - echo "DYLD_FALLBACK_LIBRARY_PATH=$DYLD_FALLBACK_LIBRARY_PATH" - cd _build && ctest -V --output-on-failure --build-config ${{ parameters.configuration }} - workingDirectory: $(Build.SourcesDirectory)/boost-root/libs/gil - displayName: 'Run CTest to test on macOS' - condition: eq(variables['Agent.OS'], 'Darwin') diff --git a/.ci/azure-pipelines/steps-install-boost.yml b/.ci/azure-pipelines/steps-install-boost.yml deleted file mode 100644 index f921737306..0000000000 --- a/.ci/azure-pipelines/steps-install-boost.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Azure Pipelines for Boost.GIL -# -# Copyright 2018-2019 Mateusz Loskot -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) -# -parameters: - # defaults, if not specified - variant: 'release' - toolset: 'gcc' - -steps: - # The $BSD_DIR is the same path as $(Build.SourcesDirectory) - # but guaranteed in Unix format /a/b/c on every OS. - - bash: | - export BSD_DIR=$PWD - cd .. - export GIL_DIR=$PWD/gil - echo "Copying $BSD_DIR to $GIL_DIR" - cp -a $BSD_DIR $GIL_DIR - cd $BSD_DIR - $GIL_DIR/.ci/get-boost.sh $(Build.SourceBranchName) $GIL_DIR - displayName: 'Download Boost' - - - script: | - cd boost-root - ./bootstrap.sh - sudo ./b2 headers - sudo ./b2 -j4 toolset=${{ parameters.toolset }} variant=${{ parameters.variant }} --with-filesystem stage - ls stage/lib - displayName: 'Install Boost on Unix' - condition: ne(variables['Agent.OS'], 'Windows_NT') - - - script: | - cd boost-root - call .\bootstrap.bat - .\b2 headers - .\b2 -j4 address-model=32 variant=${{ parameters.variant }} --layout=system --with-filesystem stage - dir stage\lib - displayName: 'Install Boost on Windows' - condition: eq(variables['Agent.OS'], 'Windows_NT') diff --git a/.ci/azure-pipelines/steps-install-conan.yml b/.ci/azure-pipelines/steps-install-conan.yml deleted file mode 100644 index 70507a4bb6..0000000000 --- a/.ci/azure-pipelines/steps-install-conan.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Azure Pipelines for Boost.GIL -# -# Copyright 2018-2019 Mateusz Loskot -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) -# -parameters: - python: 'python' # default, if not specified - -steps: - - script: | - ${{ parameters.python }} --version - ${{ parameters.python }} -m ensurepip - ${{ parameters.python }} -m pip install --upgrade pip - ${{ parameters.python }} -m pip install --upgrade conan - conan --version - displayName: 'Install Conan' diff --git a/.ci/azure-pipelines/steps-install-gcc.yml b/.ci/azure-pipelines/steps-install-gcc.yml deleted file mode 100644 index 2f11eb5d81..0000000000 --- a/.ci/azure-pipelines/steps-install-gcc.yml +++ /dev/null @@ -1,18 +0,0 @@ -# Azure Pipelines for Boost.GIL -# -# Copyright 2019 Mateusz Loskot -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) -# -parameters: - # defaults, if not specified - major_version: 8 - -steps: - - bash: | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq - sudo apt-get install g++-${{ parameters.major_version }} - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${{ parameters.major_version }} 90 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ parameters.major_version }} 90 - displayName: 'Install GCC' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a49372079c..9d4760daee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: os: ubuntu-20.04 - toolset: clang cxxstd: "14,17" - os: macos-10.15 + os: macos-11 runs-on: ${{matrix.os}} diff --git a/README.md b/README.md index d71fe15a1f..b46d70a57d 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ [![Conan](https://img.shields.io/badge/on-conan-blue.svg)](https://bintray.com/bincrafters/public-conan/boost_gil%3Abincrafters) [![Vcpkg](https://img.shields.io/badge/on-vcpkg-blue.svg)](https://github.com/Microsoft/vcpkg/tree/master/ports/boost-gil) -Documentation | GitHub Actions | AppVeyor | Azure Pipelines | Regression | Codecov ---------------|----------------|----------|-----------------|------------|---------- -[![develop](https://img.shields.io/badge/doc-develop-blue.svg)](https://boostorg.github.io/gil/develop/) | [![GitHub Actions](https://github.com/boostorg/gil/workflows/CI/badge.svg?branch=develop)](https://github.com/boostorg/gil/actions?query=branch:develop) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/w4k19d8io2af168h/branch/develop?svg=true)](https://ci.appveyor.com/project/stefanseefeld/gil/branch/develop) | [![Azure](https://dev.azure.com/boostorg/gil/_apis/build/status/boostorg.gil?branchName=develop)](https://dev.azure.com/boostorg/gil/_build/latest?definitionId=7&branchName=develop) | [![gil](https://img.shields.io/badge/gil-develop-blue.svg)](http://www.boost.org/development/tests/develop/developer/gil.html) | [![codecov](https://codecov.io/gh/boostorg/gil/branch/develop/graphs/badge.svg)](https://app.codecov.io/gh/boostorg/gil/branch/develop) -[![master](https://img.shields.io/badge/doc-master-blue.svg)](https://boostorg.github.io/gil/) | [![GitHub Actions](https://github.com/boostorg/gil/workflows/CI/badge.svg?branch=master)](https://github.com/boostorg/gil/actions?query=branch:master) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/w4k19d8io2af168h?svg=true)](https://ci.appveyor.com/project/stefanseefeld/gil/branch/master) | [![Azure](https://dev.azure.com/boostorg/gil/_apis/build/status/boostorg.gil?branchName=master)](https://dev.azure.com/boostorg/gil/_build/latest?definitionId=7&branchName=master) | [![gil](https://img.shields.io/badge/gil-master-blue.svg)](http://www.boost.org/development/tests/master/developer/gil.html) | [![codecov](https://codecov.io/gh/boostorg/gil/branch/master/graphs/badge.svg)](https://app.codecov.io/gh/boostorg/gil/branch/master) +Documentation | GitHub Actions | AppVeyor | Regression | Codecov +--------------|----------------|----------|------------|---------- +[![develop](https://img.shields.io/badge/doc-develop-blue.svg)](https://boostorg.github.io/gil/develop/) | [![GitHub Actions](https://github.com/boostorg/gil/workflows/CI/badge.svg?branch=develop)](https://github.com/boostorg/gil/actions?query=branch:develop) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/w4k19d8io2af168h/branch/develop?svg=true)](https://ci.appveyor.com/project/stefanseefeld/gil/branch/develop) | [![gil](https://img.shields.io/badge/gil-develop-blue.svg)](http://www.boost.org/development/tests/develop/developer/gil.html) | [![codecov](https://codecov.io/gh/boostorg/gil/branch/develop/graphs/badge.svg)](https://app.codecov.io/gh/boostorg/gil/branch/develop) +[![master](https://img.shields.io/badge/doc-master-blue.svg)](https://boostorg.github.io/gil/) | [![GitHub Actions](https://github.com/boostorg/gil/workflows/CI/badge.svg?branch=master)](https://github.com/boostorg/gil/actions?query=branch:master) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/w4k19d8io2af168h?svg=true)](https://ci.appveyor.com/project/stefanseefeld/gil/branch/master) | [![gil](https://img.shields.io/badge/gil-master-blue.svg)](http://www.boost.org/development/tests/master/developer/gil.html) | [![codecov](https://codecov.io/gh/boostorg/gil/branch/master/graphs/badge.svg)](https://app.codecov.io/gh/boostorg/gil/branch/master) # Boost.GIL