Skip to content
This repository was archived by the owner on Oct 6, 2020. It is now read-only.

Commit d638d52

Browse files
caseymcccaseymcc
committed
Merge branch 'pkg.glbinding' of https://github.com/caseymcc/hunter-testing into glbinding
# Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # .travis.yml # README.rst
2 parents 5c3c41b + 7f2552d commit d638d52

4 files changed

Lines changed: 209 additions & 94 deletions

File tree

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,17 @@
1-
<!--- Use this part of template if you're adding new package. Remove the rest. -->
2-
<!--- BEGIN -->
1+
<!--- Please check that your pull request satisfy all requirements -->
32

4-
* I've followed [this guide](https://hunter.readthedocs.io/en/latest/creating-new/create/cmake.html)
5-
step by step carefully. **[Yes|No]**
3+
* I have checked that this pull request contains only
4+
`.travis.yml`/`appveyor.yml` changes. All other changes send
5+
to https://github.com/ruslo/hunter. **[Yes|No]**
66

7-
* I've tested this package remotely and have excluded all broken builds.
8-
Here is the links to the Travis/AppVeyor with status "All passed":
7+
* I have checked that no toolchains removed from CI configs, they are commented
8+
out instead so other developers can enable them back easily and to simplify
9+
merge conflict resolution. **[Yes|No]**
910

10-
* https://ci.appveyor.com/project/<username>/hunter/build/<build-number>
11-
* https://travis-ci.org/<username>/hunter/builds/<build-number>
11+
* I have checked that for every commented out toolchain there is a link to the
12+
broken CI build page or to the minimum compiler requirements documentation
13+
so other developers can figure out what was the problem exactly. **[Yes|No]**
1214

13-
* I have submitted CI configs to https://github.com/cpp-pm/hunter-testing targeting `pkg.template` branch,
14-
see this merged pull request https://github.com/cpp-pm/hunter-testing/pull/<number>
15-
16-
<!--- Remove next line if there is no corresponding "New package" issue. -->
17-
* My change will resolve this "New package" request: https://github.com/cpp-pm/hunter/issues/<number>
18-
19-
---
20-
<!--- END -->
21-
22-
<!--- Use this part of template if you're updating existing package. Remove the rest. -->
23-
<!--- BEGIN -->
24-
25-
* I've followed [this guide](https://hunter.readthedocs.io/en/latest/creating-new/update.html)
26-
step by step carefully. **[Yes|No]**
27-
28-
* I've tested this package remotely and have excluded all broken builds.
29-
Here is the links to the Travis/AppVeyor with status "All passed":
30-
31-
* https://ci.appveyor.com/project/<username>/hunter/build/<build-number>
32-
* https://travis-ci.org/<username>/hunter/builds/<build-number>
33-
34-
<!--- Remove next line if this update doesn't break old toolchains -->
35-
* This update will break few old toolchains.
36-
They are excluded in this pull request: https://github.com/cpp-pm/hunter-testing/pull/<number>
37-
38-
---
39-
<!--- END -->
40-
41-
<!--- Use this part of template for other type of changes. Remove the rest. -->
42-
<!--- BEGIN -->
43-
44-
* I've checked this [Git style guide](https://0.readthedocs.io/en/latest/git.html). **[Yes|No]**
45-
* I've checked this [CMake style guide](https://0.readthedocs.io/en/latest/cmake.html). **[Yes|No]**
46-
* My change will work with CMake 3.2 (minimum requirement for Hunter). **[Yes|No]**
47-
* I will try to keep this pull request as small as possible and will try not to mix unrelated features. **[Yes|No]**
48-
49-
---
50-
<!--- END -->
15+
<!--- Remove next line if this pull request is part of procedure of adding new package -->
16+
* I have checked that for every enabled toolchain corresponding package passed
17+
all stages of update cycle: test/merge/upload/release. **[Yes|No]**

‎.travis.yml‎

Lines changed: 99 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
# OSX/Linux (https://github.com/travis-ci-tester/toolchain-table)
22

33
language:
4-
- minimal
5-
6-
os:
7-
- linux
4+
- cpp
85

96
# Container-based infrastructure (Linux)
107
# * https://docs.travis-ci.com/user/migrating-from-legacy/#How-can-I-use-container-based-infrastructure%3F
@@ -13,50 +10,138 @@ sudo:
1310

1411
# Install packages differs for container-based infrastructure
1512
# * https://docs.travis-ci.com/user/migrating-from-legacy/#How-do-I-install-APT-sources-and-packages%3F
13+
# List of available packages:
14+
# * https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-trusty
15+
# List of available sources:
16+
# * https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
1617
addons:
1718
apt:
19+
sources:
20+
- ubuntu-toolchain-r-test
1821
packages:
1922
- python3-pip
20-
- enchant # for documentation
23+
- python3-setuptools
24+
- g++-7
2125

2226
dist:
23-
- trusty
27+
- xenial
2428

2529
env:
26-
- TOOLCHAIN=generate-documentation-test
30+
global:
31+
- secure: "s2o8nxRX/i7BSWsxlogBnyOGNO+3MhbcQrrU5y/Kk5+FwflN1vN+EwcR/kuE7U/O+gD8/ea+e0E8SSCkDwSj30NKZajYym2/DF0YSPNag1PGO9X2x53D4+clrhLPd89++bJpeOrAln1wYrYLLLFPMEq8Veo8g2ql9EHHWwwOqNM3jTPXg1fg4TOGSjgzFB3JnDo1Wjccc7eUj/nJcEMasxIBNg0n9/kjO+b9VYgxF3YVUMCnn+pdLah/AdnbwLWyvoWUz9nhRbXZx236rccFO5tzbKWON6NauIs4hiYxUC/Bu8nw5SZsjto4NwmrX0t7fAsUbMIUo4WBbI2zfao1oao0g/2HQj/QeY5yj+mkeaXosqdUbDZe2J+A+xjHu1fD6JI75jtnpOhFGYN5mPfq6fOiLcMn6Vr67T9NB1NvUpmRJ6sqzm48yxcNc9tmvsUz7BLDNbSN3YRNZ5XCVRnQfY9j1yc88oBvCPMtduUQyu5rd+c6mJ6zBhjJJvu7BM6OlscWPqiJm6+857wcDoBBDlMipZsIrrshOlUmfgyNgdrm/c1wEwDoRcnlb1hR+tKT5y653vytSs8cRJ+uG7+anofuTJJ/Der/a1A/P5ttkp2HGrAcWq4u0zYIpIiOsUlJ0uHcSl0DLQwB4JJgZBiBEibWjWqfjdXwkSVrcj833bU="
32+
33+
matrix:
34+
include:
35+
# Linux {
36+
37+
- os: linux
38+
env: >
39+
TOOLCHAIN=clang-cxx17
40+
PROJECT_DIR=examples/glbinding
41+
42+
- os: linux
43+
env: >
44+
TOOLCHAIN=gcc-7-cxx17
45+
PROJECT_DIR=examples/glbinding
46+
47+
- os: linux
48+
env: >
49+
TOOLCHAIN=android-ndk-r17-api-24-arm64-v8a-clang-libcxx14
50+
PROJECT_DIR=examples/glbinding
51+
52+
- os: linux
53+
env: >
54+
TOOLCHAIN=analyze-cxx17
55+
PROJECT_DIR=examples/glbinding
56+
57+
- os: linux
58+
env: >
59+
TOOLCHAIN=sanitize-address-cxx17
60+
PROJECT_DIR=examples/glbinding
61+
62+
- os: linux
63+
env: >
64+
TOOLCHAIN=sanitize-leak-cxx17
65+
PROJECT_DIR=examples/glbinding
66+
67+
- os: linux
68+
env: >
69+
TOOLCHAIN=sanitize-thread-cxx17
70+
PROJECT_DIR=examples/glbinding
71+
72+
# }
73+
74+
# OSX {
75+
76+
- os: osx
77+
osx_image: xcode9.4
78+
env: >
79+
TOOLCHAIN=osx-10-13-make-cxx14
80+
PROJECT_DIR=examples/glbinding
81+
82+
- os: osx
83+
osx_image: xcode9.4
84+
env: >
85+
TOOLCHAIN=osx-10-13-cxx14
86+
PROJECT_DIR=examples/glbinding
87+
# FIXME: iOS install step failes
88+
# * https://travis-ci.org/tnixeu/hunter/jobs/448503010
89+
# - os: osx
90+
# osx_image: xcode9.4
91+
# env: >
92+
# TOOLCHAIN=ios-nocodesign-11-4-dep-9-3
93+
# PROJECT_DIR=examples/glbinding
94+
#
95+
# }
2796

2897
install:
2998
# Info about OS
3099
- uname -a
31100

101+
# Info about available disk space
102+
- df -h $HOME
103+
104+
# Disable autoupdate
105+
# * https://github.com/Homebrew/brew/blob/7d31a70373edae4d8e78d91a4cbc05324bebc3ba/Library/Homebrew/manpages/brew.1.md.erb#L202
106+
- export HOMEBREW_NO_AUTO_UPDATE=1
107+
32108
# Install Python 3
109+
- if [[ "`uname`" == "Darwin" ]]; then travis_retry brew upgrade python || echo "Ignoring failure..."; fi
33110
- if [[ "`uname`" == "Darwin" ]]; then travis_retry brew install python3; fi
34111

35112
# Install Python package 'requests'
36113
# 'easy_install3' is not installed by 'brew install python3' on OS X 10.9 Maverick
37114
- if [[ "`uname`" == "Darwin" ]]; then pip3 install requests; fi
115+
- if [[ "`uname`" == "Darwin" ]]; then pip3 install gitpython; fi
38116
- if [[ "`uname`" == "Linux" ]]; then travis_retry pip3 install --user requests; fi
117+
- if [[ "`uname`" == "Linux" ]]; then travis_retry pip3 install --user gitpython; fi
39118

40119
# Install latest Polly toolchains and scripts
41-
- wget https://github.com/cpp-pm/polly/archive/master.zip
42-
- unzip master.zip
120+
- wget --quiet https://github.com/ruslo/polly/archive/master.zip
121+
- unzip -q master.zip
43122
- POLLY_ROOT="`pwd`/polly-master"
44123
- export PATH="${POLLY_ROOT}/bin:${PATH}"
45124

46125
# Install dependencies (CMake, Android NDK)
47-
- install-ci-dependencies.py
126+
- install-ci-dependencies.py --prune-archives
48127

49128
# Tune locations
50129
- export PATH="`pwd`/_ci/cmake/bin:${PATH}"
51130

52131
# Installed if toolchain is Android (otherwise directory doesn't exist)
53132
- export ANDROID_NDK_r10e="`pwd`/_ci/android-ndk-r10e"
54133
- export ANDROID_NDK_r11c="`pwd`/_ci/android-ndk-r11c"
134+
- export ANDROID_NDK_r15c="`pwd`/_ci/android-ndk-r15c"
135+
- export ANDROID_NDK_r16b="`pwd`/_ci/android-ndk-r16b"
136+
- export ANDROID_NDK_r17="`pwd`/_ci/android-ndk-r17"
55137

56138
script:
57-
- cd docs
58-
- ./jenkins.sh
139+
- travis_wait 60 python3 ./jenkins.py
59140

141+
# https://docs.travis-ci.com/user/customizing-the-build/#Whitelisting-or-blacklisting-branches
142+
# Exclude branch 'pkg.template'. Nothing to build there.
60143
branches:
61-
only:
62-
- master
144+
except:
145+
- pkg.template
146+
- /^pr\..*/
147+
- /^v[0-9]+\.[0-9]+\.[0-9]+$/

‎README.rst‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,7 @@
1-
Hunter
2-
======
1+
Hunter CI testing
2+
=================
33

4-
|gitter| |rtfd| |travis| |appveyor| |license|
4+
This repository is for deep per-package testing.
5+
The only pull requests accepting here is about continuous integration testing on Travis/AppVeyor, i.e. should only affect ``.travis.yml`` or ``appveyor.yml`` (in some rare cases ``jenkins.py``). Please contribute other stuff to https://github.com/ruslo/hunter.
56

6-
CMake driven cross-platform package manager for C/C++.
7-
Linux, Windows, macOS, iOS, Android, Raspberry Pi, etc.
8-
9-
* Documentation: https://hunter.readthedocs.io
10-
* Brief overview: https://hunter.readthedocs.io/en/latest/overview.html (**Must-read!**)
11-
* Packages: https://hunter.readthedocs.io/en/latest/packages.html
12-
* Sources: https://github.com/cpp-pm/hunter
13-
* Reporting issues: https://github.com/cpp-pm/hunter/issues/new
14-
* Contributing guide: https://hunter.readthedocs.io/en/latest/contributing.html
15-
* Contacts: https://hunter.readthedocs.io/en/latest/contacts.html
16-
* `Per package testing table <https://github.com/cpp-pm/hunter-testing/branches/all>`_
17-
18-
.. |gitter| image:: https://badges.gitter.im/cpp-pm/community.svg
19-
:target: https://gitter.im/cpp-pm/community
20-
:alt: Gitter public chat room
21-
22-
.. |rtfd| image:: https://readthedocs.org/projects/hunter/badge/?version=latest
23-
:target: http://hunter.readthedocs.io/en/latest/?badge=latest
24-
:alt: Documentation status
25-
26-
.. |travis| image:: https://img.shields.io/travis/cpp-pm/hunter-testing/pkg.gtest.svg?style=flat&logo=travis&label=Linux%20OSX%20Android%20iOS
27-
:target: https://travis-ci.com/cpp-pm/hunter-testing/builds
28-
:alt: Travis CI
29-
30-
.. |appveyor| image:: https://img.shields.io/appveyor/ci/rbsheth/hunter-testing/pkg.gtest.svg?style=flat&logo=appveyor&label=Windows
31-
:target: https://ci.appveyor.com/project/rbsheth/hunter-testing/history
32-
:alt: AppVeyor CI
33-
34-
.. |license| image:: https://img.shields.io/github/license/cpp-pm/hunter.svg
35-
:target: https://github.com/cpp-pm/hunter/blob/master/LICENSE
36-
:alt: LICENSE
7+
Thanks.

‎appveyor.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# Windows (https://github.com/travis-ci-tester/toolchain-table)
2+
3+
environment:
4+
global:
5+
# This variable used only if '--upload' added to 'jenkins.py'
6+
GITHUB_USER_PASSWORD:
7+
secure: LNJ5FPxb7CPXpslLdb63M1Z2344XY5kxQOsnE1RQ6O+hslNqTHk7pvbS+YB5+05P
8+
9+
matrix:
10+
11+
- TOOLCHAIN: "ninja-vs-15-2017-win64-cxx17"
12+
PROJECT_DIR: examples\glbinding
13+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
14+
15+
- TOOLCHAIN: "nmake-vs-15-2017-win64-cxx17"
16+
PROJECT_DIR: examples\glbinding
17+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
18+
19+
- TOOLCHAIN: "vs-15-2017-win64-cxx17"
20+
PROJECT_DIR: examples\glbinding
21+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
22+
23+
- TOOLCHAIN: "vs-16-2019-win64-cxx17"
24+
PROJECT_DIR: examples\glbinding
25+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
26+
27+
- TOOLCHAIN: "vs-14-2015-sdk-8-1"
28+
PROJECT_DIR: examples\glbinding
29+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
30+
31+
#https://ci.appveyor.com/project/caseymcc/hunter/builds/30665438/job/n0hjiflmuvwkyoy1
32+
#Know issue in latest release, https://github.com/cginternals/glbinding/issues/297
33+
# - TOOLCHAIN: "mingw-cxx17"
34+
# PROJECT_DIR: examples\glbinding
35+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
36+
37+
#https://ci.appveyor.com/project/caseymcc/hunter/builds/30665438/job/3k548iyr3j1ymy0n
38+
#Know issue in latest release, https://github.com/cginternals/glbinding/issues/297
39+
# - TOOLCHAIN: "msys-cxx17"
40+
# PROJECT_DIR: examples\glbinding
41+
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
42+
43+
install:
44+
# Python 3
45+
- cmd: set PATH=C:\Python34-x64;C:\Python34-x64\Scripts;%PATH%
46+
47+
# Install Python package 'requests', 'gitpython'
48+
- cmd: pip install requests
49+
- cmd: pip install gitpython
50+
51+
# Install latest Polly toolchains and scripts
52+
- cmd: appveyor DownloadFile https://github.com/ruslo/polly/archive/master.zip
53+
- cmd: 7z x master.zip
54+
- cmd: set POLLY_ROOT=%cd%\polly-master
55+
56+
# Install dependencies (CMake, Ninja)
57+
- cmd: python %POLLY_ROOT%\bin\install-ci-dependencies.py
58+
59+
# Tune locations
60+
- cmd: set PATH=%cd%\_ci\cmake\bin;%PATH%
61+
- cmd: set PATH=%cd%\_ci\ninja;%PATH%
62+
63+
- cmd: git submodule update --init --recursive
64+
65+
# Remove entry with sh.exe from PATH to fix error with MinGW toolchain
66+
# (For MinGW make to work correctly sh.exe must NOT be in your path)
67+
# * http://stackoverflow.com/a/3870338/2288008
68+
- cmd: set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
69+
70+
# Save git.exe in HUNTER_GIT_EXECUTABLE for upload
71+
# * https://docs.hunter.sh/en/latest/reference/user-variables.html#hunter-git-executable
72+
# Variable will be used in CMake so it's okay to use Unix style '/'
73+
- cmd: set HUNTER_GIT_EXECUTABLE=C:/Program Files/Git/bin/git.exe
74+
75+
- cmd: set MINGW_PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
76+
77+
# MSYS2 location
78+
- cmd: set MSYS_PATH=C:\msys64\usr\bin
79+
80+
# Visual Studio 15 2017: Mimic behavior of older versions
81+
- cmd: set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools
82+
83+
build_script:
84+
- cmd: python .\jenkins.py
85+
86+
# http://www.appveyor.com/docs/branches#white-and-blacklisting
87+
# Exclude branch 'pkg.template'. Nothing to build there.
88+
branches:
89+
except:
90+
- pkg.template
91+
- /^pr\..*/
92+
- /^v[0-9]+\.[0-9]+\.[0-9]+$/

0 commit comments

Comments
 (0)