Fix CI: Upgrade Python, Conan, ConanPackageTools #415
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,60 @@ | ||
| { | ||
| "config": [ | ||
| { | ||
| "name": "Linux GCC 10", | ||
| "compiler": "gcc", | ||
| "version": "10", | ||
| "os": "ubuntu-20.04" | ||
| }, | ||
| { | ||
| "name": "Linux GCC 9", | ||
| "compiler": "gcc", | ||
| "version": "9", | ||
| "os": "ubuntu-20.04" | ||
| }, | ||
| { | ||
| "name": "Linux GCC 8", | ||
| "compiler": "gcc", | ||
| "version": "8", | ||
| "os": "ubuntu-20.04" | ||
| }, | ||
| { | ||
| "name": "Linux Clang 11", | ||
| "compiler": "clang", | ||
| "version": "11", | ||
| "os": "ubuntu-20.04" | ||
| }, | ||
| { | ||
| "name": "Linux Clang 10", | ||
| "compiler": "clang", | ||
| "version": "10", | ||
| "os": "ubuntu-20.04" | ||
| }, | ||
| { | ||
| "name": "Linux Clang 9", | ||
| "compiler": "clang", | ||
| "version": "9", | ||
| "os": "ubuntu-20.04" | ||
| }, | ||
| { | ||
| "name": "macOS apple-clang 12.0", | ||
| "compiler": "apple-clang", | ||
| "version": "12.0", | ||
| "os": "macos-10.15" | ||
| }, | ||
| { | ||
| "name": "Windows VS2019", | ||
| "compiler": "Visual Studio", | ||
| "version": "16", | ||
| "os": "windows-2019", | ||
| "cmake_toolset": "Visual Studio 16 2019" | ||
| }, | ||
| { | ||
| "name": "Windows VS2017", | ||
| "compiler": "Visual Studio", | ||
| "version": "15", | ||
| "os": "windows-2016", | ||
| "cmake_toolset": "Visual Studio 15 2017 Win64" | ||
| } | ||
| ] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,11 @@ | ||
| name: Build and Tests | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
|
|
||
| env: | ||
| # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) | ||
|
|
@@ -20,10 +25,8 @@ jobs: | |
|
|
||
| - name: Generate Job Matrix | ||
| id: set-matrix | ||
| # Note: The json in this variable must be a single line for parsing to succeed. | ||
| run: echo "::set-output name=matrix::$(cat .github/matrix.json | scripts/flatten_json.py)" | ||
|
|
||
| builds: | ||
| needs: generate-matrix | ||
|
|
@@ -35,9 +38,9 @@ jobs: | |
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: "3.10.4" | ||
|
|
||
| - name: Install Dependencies (Unix) | ||
| if: ${{ matrix.config.compiler != 'Visual Studio' }} | ||
|
|
@@ -53,7 +56,8 @@ jobs: | |
| python.exe --version | ||
| cmake --version | ||
| python.exe -m pip install --upgrade pip | ||
| pip.exe install markupsafe==2.0.1 | ||
|
There was a problem hiding this comment. See conan-io/conan#10611. I could not find a more appropriate workaround than this. Conan will fail if this dependency is not available. |
||
| pip.exe install conan_package_tools==0.38.0 | ||
| pip.exe install conan==1.43.0 | ||
| conan --version | ||
| conan user | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| #!/usr/bin/env python | ||
|
|
||
| import functools as ft | ||
| import json | ||
| import sys | ||
|
|
||
| input = ft.reduce(lambda acc, i: acc + i, sys.stdin, "") | ||
| print(json.dumps(json.loads(input), separators=(',', ':'))) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should consider to add VS 2022.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried. Conan died with a non obvious error. I think adding that will have to be a separate task.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. Then later