diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c09d654..1375cbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: - pull_request env: - CONAN_VERSION: 1.21.0 + CONAN_VERSION: 1.32.0 PATH_VERSION: 13.1.0 jobs: @@ -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/setup-python@v1.1.1 + uses: actions/setup-python@v2 + with: + python-version: '3.x' - name: Checkout repository uses: actions/checkout@v1 - name: Install conan and path @@ -32,7 +34,9 @@ jobs: runs-on: ubuntu-18.04 steps: - name: Setup Python environment - uses: actions/setup-python@v1.1.1 + uses: actions/setup-python@v2 + with: + python-version: '3.x' - name: Checkout repository uses: actions/checkout@v1 - name: Install conan and path @@ -47,7 +51,9 @@ jobs: runs-on: macos-latest steps: - name: Setup Python environment - uses: actions/setup-python@v1.1.1 + 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 @@ -55,7 +61,7 @@ jobs: - 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: @@ -69,7 +75,9 @@ jobs: steps: - name: Setup Python environment - uses: actions/setup-python@v1.1.1 + 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b2f32c..56061f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/ci/conan-profiles/macos10.15 b/ci/conan-profiles/macos10.15 deleted file mode 100644 index 1344419..0000000 --- a/ci/conan-profiles/macos10.15 +++ /dev/null @@ -1,4 +0,0 @@ -include(macos) -[settings] -os.version=10.15 -compiler.version=11.0 diff --git a/ci/conan-profiles/macos11 b/ci/conan-profiles/macos11 new file mode 100644 index 0000000..503307f --- /dev/null +++ b/ci/conan-profiles/macos11 @@ -0,0 +1,4 @@ +include(macos) +[settings] +os.version=11.0 +compiler.version=12.0