Skip to content

Commit

Permalink
Merge pull request #10 from theodelrieu/fix/include_license_in_release
Browse files Browse the repository at this point in the history
Fix/include license in release
  • Loading branch information
theodelrieu authored Dec 8, 2020
2 parents bce1c2d + c3c4f9d commit a33b593
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 13 deletions.
20 changes: 14 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
- pull_request

env:
CONAN_VERSION: 1.21.0
CONAN_VERSION: 1.32.0
PATH_VERSION: 13.1.0

jobs:
Expand All @@ -15,7 +15,9 @@ jobs:
compiler: [clang++-3.9, clang++-4.0, clang++-5.0, clang++-6.0, g++-5, g++-6, g++-7, g++-8]
steps:
- name: Setup Python environment
uses: actions/[email protected]
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Checkout repository
uses: actions/checkout@v1
- name: Install conan and path
Expand All @@ -32,7 +34,9 @@ jobs:
runs-on: ubuntu-18.04
steps:
- name: Setup Python environment
uses: actions/[email protected]
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Checkout repository
uses: actions/checkout@v1
- name: Install conan and path
Expand All @@ -47,15 +51,17 @@ jobs:
runs-on: macos-latest
steps:
- name: Setup Python environment
uses: actions/[email protected]
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install conan and path
run: pip install conan==$CONAN_VERSION path==$PATH_VERSION --user
- name: Checkout repository
uses: actions/checkout@v1
- name: Install build tools
run: brew install ninja
- name: Build and test
run: python $GITHUB_WORKSPACE/ci/run-ci.py build-and-test --profile $GITHUB_WORKSPACE/ci/conan-profiles/macos10.15
run: python $GITHUB_WORKSPACE/ci/run-ci.py build-and-test --profile $GITHUB_WORKSPACE/ci/conan-profiles/macos11
build-windows:
runs-on: windows-latest
strategy:
Expand All @@ -69,7 +75,9 @@ jobs:

steps:
- name: Setup Python environment
uses: actions/[email protected]
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install conan and path
run: pip install conan==$env:CONAN_VERSION path==$env:PATH_VERSION --user
- name: Checkout repository
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: lukka/get-cmake@latest
- uses: actions/setup-python@v1
- uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: '3.x'
- name: Install ninja and g++
run: sudo apt install ninja-build g++-8
- name: Install Conan
run: pip install conan==1.21.0
run: pip install conan==1.32.0
- name: Install source files
run: |
mkdir build && cd build
conan workspace install ..
cmake -G Ninja .. -DCMAKE_INSTALL_PREFIX=install/mgs -DBUILD_TESTING=OFF
ninja install
cp ../LICENSE .
- uses: fnkr/github-action-ghr@v1
env:
GHR_COMPRESS: zip
Expand Down
4 changes: 0 additions & 4 deletions ci/conan-profiles/macos10.15

This file was deleted.

4 changes: 4 additions & 0 deletions ci/conan-profiles/macos11
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
include(macos)
[settings]
os.version=11.0
compiler.version=12.0

0 comments on commit a33b593

Please sign in to comment.