Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/boostorg/gil into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
meshtag committed Apr 21, 2021
2 parents f4369d1 + bbdce36 commit fe1621e
Show file tree
Hide file tree
Showing 132 changed files with 8,264 additions and 646 deletions.
28 changes: 14 additions & 14 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@ environment:
CXXSTD: 11
TEST_HEADERS: 1
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: msvc-14.1
ARCH: x86_64
VARIANT: debug
CXXSTD: 17
TEST_HEADERS: 1
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: msvc-14.1
ARCH: x86_64
VARIANT: release
CXXSTD: 17
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: msvc-14.1
ARCH: x86_64
VARIANT: debug
Expand All @@ -64,10 +53,21 @@ environment:
- TOOLSET: msvc-14.1
ARCH: x86_64
VARIANT: debug
CXXSTD: 14
GENERATOR: "Visual Studio 15 2017 Win64"
CMAKE_CONFIG: Debug
CXXSTD: 17
TEST_HEADERS: 1
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- TOOLSET: msvc-14.1
ARCH: x86_64
VARIANT: release
CXXSTD: 17
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
# - TOOLSET: msvc-14.1
# ARCH: x86_64
# VARIANT: debug
# CXXSTD: 14
# GENERATOR: "Visual Studio 15 2017 Win64"
# CMAKE_CONFIG: Debug
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

matrix:
fast_finish: true
Expand Down
11 changes: 9 additions & 2 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
#
variables:
system.debug: true
#system.debug: true
configuration: release

trigger:
Expand All @@ -15,10 +15,13 @@ trigger:
- ml/*

jobs:
- job: 'ubuntu1604_gcc5_cxx11_cmake'
- job: 'ubuntu1604_gcc6_cxx14_cmake'
pool:
vmImage: 'ubuntu-16.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
Expand All @@ -28,12 +31,16 @@ jobs:
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: 'ubuntu1604_gcc8_cxx14_cmake'
pool:
vmImage: 'ubuntu-16.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
Expand Down
7 changes: 0 additions & 7 deletions .ci/coverage.sh

This file was deleted.

53 changes: 0 additions & 53 deletions .ci/upload_docs.sh

This file was deleted.

4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ env_gcc_cpp11_dbg: &env_gcc_cpp11_dbg
- OPTIMIZ: ""
- CXXSTD: "11"
- LNKFLAG: ""
- B2_VERBOSE: "0"

env_gcc_cpp11_opt_speed: &env_gcc_cpp11_opt_speed
environment:
Expand All @@ -95,6 +96,7 @@ env_gcc_cpp11_opt_speed: &env_gcc_cpp11_opt_speed
- OPTIMIZ: "optimization=speed"
- CXXSTD: "11"
- LNKFLAG: ""
- B2_VERBOSE: "0"

env_clang_cpp11_dbg: &env_clang_cpp11_dbg
environment:
Expand All @@ -103,6 +105,7 @@ env_clang_cpp11_dbg: &env_clang_cpp11_dbg
- OPTIMIZ: ""
- CXXSTD: "11"
- LNKFLAG: ""
- B2_VERBOSE: "0"

env_clang_cpp11_opt_speed: &env_clang_cpp11_opt_speed
environment:
Expand All @@ -111,6 +114,7 @@ env_clang_cpp11_opt_speed: &env_clang_cpp11_opt_speed
- OPTIMIZ: "optimization=speed"
- CXXSTD: "11"
- LNKFLAG: ""
- B2_VERBOSE: "0"

##############################################################################
# Build configurations
Expand Down
7 changes: 7 additions & 0 deletions .github/actions/docs-prerequisites/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: 'Get Docs Prerequisites'
description: 'Downloads all the necessary packages for building documentation'
runs:
using: composite
steps:
- run: sudo apt-get install doxygen python3 python3-pip python3-setuptools python3-sphinx
shell: bash
13 changes: 13 additions & 0 deletions .github/actions/generate-doc/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 'Generate Doc'
description: 'Runs b2 on lib/gil/doc to generate documentation'
runs:
using: composite
steps:
- run: |
echo "using doxygen ;" > ~/user-config.jam
cd ../boost-root/libs
../b2 gil/doc
cd gil
chmod +x $GITHUB_WORKSPACE/.github/actions/generate-doc/docs-config.sh
$GITHUB_WORKSPACE/.github/actions/generate-doc/docs-config.sh
shell: bash
32 changes: 32 additions & 0 deletions .github/actions/generate-doc/docs-config.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash
set -e # Exit with Non Zero exit Code

mkdir temp-doc
cd temp-doc

git init


git remote add upstream "https://github.com/boostorg/gil.git"

git fetch upstream
git switch gh-pages


if [ "${GITHUB_REF##*/}" = develop ]; then
# Only updates develop directory and keeps others intact
rm -r develop
mkdir -p develop/doc
cp ../index.html develop/
cp ../doc/index.html develop/doc
cp -a ../doc/html develop/doc/
else
# main branch
rm index.html
rm -r html
cp ../doc/index.html .
cp -r ../doc/html .
fi

# Remove version control
rm -rf .git
17 changes: 17 additions & 0 deletions .github/actions/setup-boost/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'Setup-Boost'
description: 'Downloads and sets up the necessary dependencies of Boost'
runs:
using: composite
steps:
- run: |
REF=${GITHUB_BASE_REF:-$GITHUB_REF}
BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
cd ..
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
cp -r $GITHUB_WORKSPACE/* libs/gil
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" gil
./bootstrap.sh
./b2 -d0 headers
shell: bash
Loading

0 comments on commit fe1621e

Please sign in to comment.