Skip to content

Commit

Permalink
update conan and azure-pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
phlptp committed Aug 24, 2022
1 parent a455778 commit aa190b7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
20 changes: 16 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@ jobs:
gcc8:
containerImage: gcc:8
cli11.std: 17
gcc4.8:
containerImage: gcc:4.8
cli11.std: 11
cli11.options:
clang3.4:
containerImage: silkeh/clang:3.4
cli11.std: 11
Expand All @@ -133,3 +129,19 @@ jobs:
- template: .ci/azure-cmake.yml
- template: .ci/azure-build.yml
- template: .ci/azure-test.yml

- job: Docker2
variables:
cli11.single: OFF
pool:
vmImage: "ubuntu-latest"
strategy:
matrix:
gcc4.8:
containerImage: helics/buildenv:gcc4-8-builder
cli11.std: 11
cli11.options:
container: $[ variables['containerImage'] ]
steps:
- template: .ci/azure-build.yml
- template: .ci/azure-test.yml
1 change: 1 addition & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class CLI11Conan(ConanFile):
"LICENSE",
"README.md",
"include/*",
"src/*",
"extern/*",
"cmake/*",
"CMakeLists.txt",
Expand Down

0 comments on commit aa190b7

Please sign in to comment.