Skip to content

Commit

Permalink
Merge branch 'master' into cpp20-concepts
Browse files Browse the repository at this point in the history
  • Loading branch information
1uc authored Jul 28, 2023
2 parents 00ff309 + 3f005dc commit 7f14fdb
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ jobs:
os: ubuntu-20.04
pkgs: 'libboost-all-dev'
flags: '-DCMAKE_CXX_STANDARD=17'
- config:
os: ubuntu-22.04
flags: '-DHIGHFIVE_USE_BOOST=Off -DCMAKE_CXX_STANDARD=20'

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -262,7 +265,11 @@ jobs:
# Job testing in OSX
# ==================
OSX:
runs-on: macOS-12
runs-on: ${{matrix.os}}
strategy:
matrix:
os: [ "macOS-12" ]
cxxstd: ["14", "17", "20"]

steps:
- uses: actions/checkout@v3
Expand All @@ -282,6 +289,7 @@ jobs:
-DHIGHFIVE_BUILD_DOCS:BOOL=FALSE
-DHIGHFIVE_TEST_SINGLE_INCLUDES=ON
-DCMAKE_CXX_FLAGS="-coverage -O0"
-DCMAKE_CXX_STANDARD=${{matrix.cxxstd}}
)
source $GITHUB_WORKSPACE/.github/build.sh
Expand All @@ -302,7 +310,7 @@ jobs:
matrix:
os: [ "windows-2022"]
vs-toolset: [ "v141", "v143" ]
cxxstd: ["14", "17"]
cxxstd: ["14", "17", "20"]

include:
- os: "windows-2019"
Expand Down

0 comments on commit 7f14fdb

Please sign in to comment.