Skip to content

Commit

Permalink
Merge branch 'master' into pr.filament
Browse files Browse the repository at this point in the history
  • Loading branch information
Eli Semory committed Oct 28, 2020
2 parents 9b445b6 + 132dc3c commit be4d59b
Show file tree
Hide file tree
Showing 94 changed files with 1,512 additions and 148 deletions.
2 changes: 0 additions & 2 deletions .github/FUNDING.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- If you have a trivial question you can ask it in Gitter room: https://gitter.im/ruslo/hunter -->
<!--- If you have a trivial question you can ask it in Gitter room: https://gitter.im/cpp-pm/hunter -->

* I've read [Brief overview section](https://hunter.readthedocs.io/en/latest/overview.html) and do understand basic concepts. **[Yes|No]**
* I've read [F.A.Q. section](https://hunter.readthedocs.io/en/latest/faq.html) and haven't found an answer to my question. **[Yes|No]**
Expand Down
25 changes: 8 additions & 17 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@
* I've followed [this guide](https://hunter.readthedocs.io/en/latest/creating-new/create/cmake.html)
step by step carefully. **[Yes|No]**

* I've tested this package remotely and have excluded all broken builds.
Here is the links to the Travis/AppVeyor with status "All passed":

* https://ci.appveyor.com/project/<username>/hunter/build/<build-number>
* https://travis-ci.org/<username>/hunter/builds/<build-number>

* I have submitted CI configs to https://github.com/cpp-pm/hunter-testing targeting `pkg.template` branch,
see this merged pull request https://github.com/cpp-pm/hunter-testing/pull/<number>

<!--- Remove next line if there is no corresponding "New package" issue. -->
* My change will resolve this "New package" request: https://github.com/cpp-pm/hunter/issues/<number>

Expand All @@ -25,15 +16,15 @@
* I've followed [this guide](https://hunter.readthedocs.io/en/latest/creating-new/update.html)
step by step carefully. **[Yes|No]**

* I've tested this package remotely and have excluded all broken builds.
Here is the links to the Travis/AppVeyor with status "All passed":

* https://ci.appveyor.com/project/<username>/hunter/build/<build-number>
* https://travis-ci.org/<username>/hunter/builds/<build-number>
<!--- Remove next line if this update doesn't break toolchains -->
* This update will break a few toolchains.
- Toolchain 1
- Toolchain 2

<!--- Remove next line if this update doesn't break old toolchains -->
* This update will break few old toolchains.
They are excluded in this pull request: https://github.com/cpp-pm/hunter-testing/pull/<number>
<!--- Remove next line if this update doesn't fix toolchains -->
* This update will fix a few toolchains.
- Toolchain 1
- Toolchain 2

---
<!--- END -->
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
env:
TOOLCHAIN: ${{ matrix.toolchain }}
PROJECT_DIR: examples/${{ matrix.example }}
GITHUB_USER_PASSWORD: ${{ secrets.CPP_PM_BOT_TOKEN }}

steps:

Expand All @@ -68,17 +69,34 @@ jobs:
with:
python-version: ${{ matrix.python }}

- name: Set up Python environment variable (Unix)
if: runner.os != 'Windows'
run: echo "HUNTER_PYTHON_LOCATION=$pythonLocation" >> $GITHUB_ENV

- name: Set up Python environment variable (Windows)
if: runner.os == 'Windows'
run: echo "HUNTER_PYTHON_LOCATION=$env:pythonLocation" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8

- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]${GITHUB_REF#refs/heads/}"
id: extract_branch

- name: Upgrade pip
run: |
python -m pip install --upgrade pip
- name: Build on Unix
if: runner.os != 'Windows'
env:
BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
run: |
bash ${{ matrix.script }}
- name: Build on Windows
if: runner.os == 'Windows'
env:
BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
run: |
${{ matrix.script }}
Expand Down Expand Up @@ -113,4 +131,4 @@ jobs:
publish_dir: job_data
destination_dir: _data/projects
keep_files: true
enable_jekyll: true
enable_jekyll: true
12 changes: 9 additions & 3 deletions .github/workflows/ci/build.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
:: Install Python package 'requests'
pip install requests
pip install gitpython
pip install requests gitpython

:: Install latest Polly toolchains and scripts
C:\msys64\usr\bin\wget.exe https://github.com/cpp-pm/polly/archive/master.zip
Expand Down Expand Up @@ -33,10 +32,17 @@ set MSYS_PATH=C:\msys64\usr\bin
:: Visual Studio 15 2017: Mimic behavior of older versions
set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools

:: Visual Studio 16 2019: Mimic behavior of older versions
set VS160COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools

:: To fix "path too long" error
if "%TOOLCHAIN:~0,3%"=="vs-" set HUNTER_BINARY_DIR=C:\__BIN

:: Add msbuild to PATH (for vs-14 toolchain, GitHub windows-2016 runner doesn't have VS 2015)
if "%TOOLCHAIN:~0,5%"=="vs-14" set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin;%PATH%

python jenkins.py
if "%BRANCH_NAME%" == "master" (
python jenkins.py --upload
) else (
python jenkins.py
)
9 changes: 6 additions & 3 deletions .github/workflows/ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Install Python package 'requests'
pip install requests
pip install gitpython
pip install requests gitpython

# Install latest Polly toolchains and scripts
wget https://github.com/cpp-pm/polly/archive/master.zip
Expand All @@ -27,4 +26,8 @@ if [[ "$TOOLCHAIN" =~ "ios-nocodesign-13-2" ]]; then
fi

# Run build script
python jenkins.py
if [[ "$BRANCH_NAME" == "master" ]]; then
python jenkins.py --upload
else
python jenkins.py
fi
6 changes: 5 additions & 1 deletion .github/workflows/ci/matrix.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
[
{ "example": "foo", "toolchain": "clang-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "gcc-7-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "gcc-8-cxx17-fpic", "os": "ubuntu-18.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "gcc-9-cxx17-fpic", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "android-ndk-r17-api-24-arm64-v8a-clang-libcxx14", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "analyze-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "sanitize-address-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "sanitize-leak-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "sanitize-thread-cxx17", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "osx-10-13-make-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "osx-10-13-cxx14", "os": "macos-10.15", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "osx-10-15-dep-10-10-cxx17", "os": "macos-10.15", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "ios-nocodesign-13-2-dep-9-3", "os": "macos-10.15", "python": "3.8", "script": "build.sh" },
{ "example": "foo", "toolchain": "ninja-vs-15-2017-win64-cxx17", "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
{ "example": "foo", "toolchain": "nmake-vs-15-2017-win64-cxx17", "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
{ "example": "foo", "toolchain": "vs-16-2019-win64-cxx17", "os": "windows-2019", "python": "3.8", "script": "build.cmd" },
{ "example": "foo", "toolchain": "vs-15-2017-win64-cxx17", "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
{ "example": "foo", "toolchain": "vs-14-2015-sdk-8-1", "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
{ "example": "foo", "toolchain": "mingw-cxx17", "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
{ "example": "foo", "toolchain": "msys-cxx17", "os": "windows-2016", "python": "3.8", "script": "build.cmd" }
]
]
62 changes: 0 additions & 62 deletions .travis.yml

This file was deleted.

12 changes: 2 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Hunter
======

|gitter| |rtfd| |travis| |appveyor| |license|
|gitter| |rtfd| |license|

CMake driven cross-platform package manager for C/C++.
Linux, Windows, macOS, iOS, Android, Raspberry Pi, etc.
Expand All @@ -13,7 +13,7 @@ Linux, Windows, macOS, iOS, Android, Raspberry Pi, etc.
* Reporting issues: https://github.com/cpp-pm/hunter/issues/new
* Contributing guide: https://hunter.readthedocs.io/en/latest/contributing.html
* Contacts: https://hunter.readthedocs.io/en/latest/contacts.html
* `Per package testing table <https://github.com/cpp-pm/hunter-testing/branches/all>`_
* `Per package testing table <https://cpp-pm.github.io/hunter/>`_

.. |gitter| image:: https://badges.gitter.im/cpp-pm/community.svg
:target: https://gitter.im/cpp-pm/community
Expand All @@ -23,14 +23,6 @@ Linux, Windows, macOS, iOS, Android, Raspberry Pi, etc.
:target: http://hunter.readthedocs.io/en/latest/?badge=latest
:alt: Documentation status

.. |travis| image:: https://img.shields.io/travis/cpp-pm/hunter-testing/pkg.gtest.svg?style=flat&logo=travis&label=Linux%20OSX%20Android%20iOS
:target: https://travis-ci.com/cpp-pm/hunter-testing/builds
:alt: Travis CI

.. |appveyor| image:: https://img.shields.io/appveyor/ci/rbsheth/hunter-testing/pkg.gtest.svg?style=flat&logo=appveyor&label=Windows
:target: https://ci.appveyor.com/project/rbsheth/hunter-testing/history
:alt: AppVeyor CI

.. |license| image:: https://img.shields.io/github/license/cpp-pm/hunter.svg
:target: https://github.com/cpp-pm/hunter/blob/master/LICENSE
:alt: LICENSE
Loading

0 comments on commit be4d59b

Please sign in to comment.