diff --git a/.ci/upload_docs.sh b/.ci/upload_docs.sh deleted file mode 100755 index f8b98b5f55..0000000000 --- a/.ci/upload_docs.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -set -e # Exit with nonzero exit code if anything fails - -SOURCE_BRANCH="master" -TARGET_BRANCH="gh-pages" - -# Pull requests and commits to other branches shouldn't try to deploy, just build to verify -if [ "$TRAVIS_PULL_REQUEST" != "false" ] || \ - [ "$TRAVIS_BRANCH" != master -a \ - "$TRAVIS_BRANCH" != develop -a \ - "$TRAVIS_BRANCH" != doc -a \ - "$TRAVIS_BRANCH" != ci ]; then - echo "No docs to upload." - exit 0 -fi - -if [ -z "$GH_TOKEN" ]; then - echo "Error: GH_TOKEN is undefined" - exit 1 -fi - -# Save some useful information -REPO=`git config remote.origin.url` -SHA=`git rev-parse --verify HEAD` - -# doc happens to contain the "html" tree that we want to push -# into the gh-pages branch. So we step into that directory, create a new repo, -# set the remote appropriately, then commit and push. -cd doc -git init -git config user.name "Travis CI" -git config user.email "travis-ci" - -# Make sure 'GH_TOKEN' is set (as 'secure' variable) in .travis.yml -git remote add upstream "https://$GH_TOKEN@github.com/boostorg/gil.git" -git fetch upstream -git reset upstream/gh-pages - -# Prepare version. -if [ "$TRAVIS_BRANCH" = develop -o "$TRAVIS_BRANCH" = doc ]; then - mkdir -p develop/doc/ - cp ../index.html develop/ - cp ../doc/index.html develop/doc/ - cp -a html develop/doc/ - git add -A develop -else - git add html index.html -fi -# Commit the new version. -git commit -m "Deploy to GitHub Pages: ${SHA}" - -# Now that we're all set up, we can push. -git push -q upstream HEAD:gh-pages diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3e46e5a11b..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 2016 Peter Dimov -# 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) -dist: xenial - -language: cpp - -sudo: false - -os: - - linux - - osx - -env: - matrix: - - BOGUS_JOB=true - -matrix: - fast_finish: true - exclude: - - env: BOGUS_JOB=true - include: - - os: linux - env: COMPILER=g++-5 VARIANT=debug TOOLSET=gcc CXXSTD=11 TEST_HEADERS=1 - addons: - apt: - packages: - - g++-5 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=g++-5 VARIANT=release TOOLSET=gcc CXXSTD=14 - addons: - apt: - packages: - - g++-5 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=g++-6 VARIANT=debug TOOLSET=gcc CXXSTD=14 - addons: - apt: - packages: - - g++-6 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=g++-6 VARIANT=release TOOLSET=gcc CXXSTD=11 - addons: - apt: - packages: - - g++-6 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=g++-7 VARIANT=debug TOOLSET=gcc CXXSTD=17 - addons: - apt: - packages: - - g++-7 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=g++-7 VARIANT=release TOOLSET=gcc CXXSTD=17 - addons: - apt: - packages: - - g++-7 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=g++-9 VARIANT=debug TOOLSET=gcc CXXSTD=2a - addons: - apt: - packages: - - g++-9 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=g++-9 VARIANT=release TOOLSET=gcc CXXSTD=2a - addons: - apt: - packages: - - g++-9 - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=clang++-3.9 VARIANT=debug TOOLSET=clang CXXSTD=11 - addons: - apt: - packages: - - clang-3.9 - - libstdc++-6-dev - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - - os: linux - env: COMPILER=clang++-3.9 VARIANT=release TOOLSET=clang CXXSTD=11 - addons: - apt: - packages: - - clang-3.9 - - libstdc++-6-dev - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.9 - - - os: linux - env: COMPILER=clang++-6.0 VARIANT=gil_ubsan_integer TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1' - addons: - apt: - packages: - - clang-6.0 - - libstdc++-7-dev - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=clang++-6.0 VARIANT=gil_ubsan_nullability TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1' - addons: - apt: - packages: - - clang-6.0 - - libstdc++-7-dev - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: COMPILER=clang++-6.0 VARIANT=gil_ubsan_undefined TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1' - addons: - apt: - packages: - - clang-6.0 - - libstdc++-7-dev - - libpng-dev - - libjpeg-dev - - libtiff5-dev - - libraw-dev - sources: - - ubuntu-toolchain-r-test - - - os: osx - env: COMPILER=clang++ VARIANT=debug TOOLSET=clang CXXSTD=11 - - - os: osx - env: COMPILER=clang++ VARIANT=release TOOLSET=clang CXXSTD=11 - - - env: - - DOC=1 - - secure: "UHit2f6Hq2pkHvx8rfrQvFacYiQKVO3vrCbNuDi/VSAIzQjRnqCqE06y4vpXLMsXf62TvBeCBStIuI8g+HP8B+f39oGb/9Om+yIgN/yes47R4sLFKFbRiOS6sfCIefJp7Kx7GSFf81xWxStpIU4QaSsk8Dlt5xyurTWXFSde+lQ=" - addons: - apt: - packages: - - doxygen - - python3 - - python3-pip - - python3-setuptools - -install: - - |- - if [ "$DOC" ]; then - pip3 --version - pip3 install --upgrade pip - pip3 install --user sphinx>=2.1 - sphinx-build --version - fi - - cd .. - - $TRAVIS_BUILD_DIR/.ci/get-boost.sh $TRAVIS_BRANCH $TRAVIS_BUILD_DIR - - cd boost-root - - export BOOST_ROOT=$(pwd) - - ./bootstrap.sh - -script: - - |- - if [ "$DOC" ]; then - echo "using doxygen ;" > ~/user-config.jam - ./b2 libs/gil/doc - else - echo "using $TOOLSET : : $COMPILER : ;" > ~/user-config.jam - ./b2 -j 2 $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/core - ./b2 -j 2 $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/legacy - ./b2 -j 2 $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/extension/dynamic_image - ./b2 -j 2 $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/extension/numeric - ./b2 -j 2 $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/extension/toolbox - ./b2 -j 2 $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/extension/io//simple - fi - -after_success: -# Upload docs only when building upstream. - - |- - if [ "$DOC" -a \ - "$TRAVIS_REPO_SLUG" = "boostorg/gil" -a \ - "$TRAVIS_PULL_REQUEST" = "false" ]; then - export GH_TOKEN - cd libs/gil - .ci/upload_docs.sh - fi - -notifications: - email: - on_success: always - webhooks: - urls: - - https://webhooks.gitter.im/e/f59b626f2ed08f3d30ab - # options: [always|never|change] - on_success: change # default: always - on_failure: always # default: always - on_start: change # default: never - on_cancel: always # default: always - on_error: always # default: always diff --git a/CMakeLists.txt b/CMakeLists.txt index 52327b933a..fc5e60123b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ message(STATUS "Boost.GIL: Require C++${CMAKE_CXX_STANDARD}") set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -# Avoid warnings flood on Travis CI, AppVeyor, CircleCI, Azure Pipelines +# Avoid warnings flood from CI builds if(DEFINED ENV{CI} OR DEFINED ENV{AGENT_JOBSTATUS} OR DEFINED ENV{GITHUB_ACTIONS}) set(BOOST_GIL_BUILD_CI ON) message(STATUS "Boost.GIL: Turning off detailed compiler warnings for CI build short log") diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 248d4471a1..8e02153ced 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -233,10 +233,10 @@ git push feature/foo Finally, sign in to your GitHub account and [create a pull request](https://help.github.com/articles/creating-a-pull-request/). -Your pull request will be automatically built and tests will run on Travis CI -and AppVeyor (see [README](README.md) for builds status). Please, keep an eye -on those CI builds and correct any problems detected in your contribution -by updating your pull request. +Your pull request will be automatically built and tests will run on GitHub ACtions, +Azure Pipelines, AppVeyor and Circle CI (see [README](README.md) for builds status). +Please, keep an eye on those CI builds and correct any problems detected in your +contribution by updating your pull request. ### 5. Update your pull request @@ -300,7 +300,7 @@ request from reviewer, just add new commits: cd libs/gil git checkout feature/foo git add -A -git commit -m "Fix build Travis CI failures" +git commit -m "Fix CI build failure" git push feature/foo ``` diff --git a/README.md b/README.md index 055555f8aa..31837aedd2 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 | AppVeyor | Azure Pipelines | Travis CI | CircleCI | Regression ---------------|-----------------|-----------------|-----------------|-----------------|------------ -[![develop](https://img.shields.io/badge/doc-develop-blue.svg)](https://boostorg.github.io/gil/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) | [![Travis](https://travis-ci.org/boostorg/gil.svg?branch=develop)](https://travis-ci.org/boostorg/gil) | [![CircleCI](https://circleci.com/gh/boostorg/gil/tree/develop.svg?style=shield)](https://circleci.com/gh/boostorg/workflows/gil/tree/develop) | [![gil](https://img.shields.io/badge/gil-develop-blue.svg)](http://www.boost.org/development/tests/develop/developer/gil.html) -[![master](https://img.shields.io/badge/doc-master-blue.svg)](https://boostorg.github.io/gil/) | [![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) | [![Travis](https://travis-ci.org/boostorg/gil.svg?branch=master)](https://travis-ci.org/boostorg/gil) | [![CircleCI](https://circleci.com/gh/boostorg/gil/tree/master.svg?style=shield)](https://circleci.com/gh/boostorg/workflows/gil/tree/master) | [![gil](https://img.shields.io/badge/gil-master-blue.svg)](http://www.boost.org/development/tests/master/developer/gil.html) +Documentation | GitHub Actions | Azure Pipelines | CircleCI | Regression +--------------|----------------|-----------------|-----------------|------------ +[![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) | [![CircleCI](https://circleci.com/gh/boostorg/gil/tree/develop.svg?style=shield)](https://circleci.com/gh/boostorg/workflows/gil/tree/develop) | [![gil](https://img.shields.io/badge/gil-develop-blue.svg)](http://www.boost.org/development/tests/develop/developer/gil.html) +[![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) | [![CircleCI](https://circleci.com/gh/boostorg/gil/tree/master.svg?style=shield)](https://circleci.com/gh/boostorg/workflows/gil/tree/master) | [![gil](https://img.shields.io/badge/gil-master-blue.svg)](http://www.boost.org/development/tests/master/developer/gil.html) # Boost.GIL diff --git a/test/Jamfile b/test/Jamfile index cfca2f4436..f787b72a86 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -16,7 +16,7 @@ import regex ; import sequence ; import testing ; -# Avoid warnings flood on Travis CI, AppVeyor, CircleCI, Azure Pipelines, GitHub Actions +# Avoid warnings flood from CI builds if ! [ os.environ CI ] && ! [ os.environ AGENT_JOBSTATUS ] && ! [ os.environ GITHUB_ACTIONS ] { DEVELOPMENT_EXTRA_WARNINGS =