Commit 7cdd95e312e52f5866f475c96eef39982a2d6484
Committed by
Henry Schreiner
1 parent
99a8edcf
chore: update pre-commit and GHA
Showing
3 changed files
with
15 additions
and
10 deletions
.github/workflows/build.yml
| @@ -16,11 +16,11 @@ jobs: | @@ -16,11 +16,11 @@ jobs: | ||
| 16 | runs-on: ubuntu-latest | 16 | runs-on: ubuntu-latest |
| 17 | steps: | 17 | steps: |
| 18 | 18 | ||
| 19 | - - uses: actions/checkout@v1 | 19 | + - uses: actions/checkout@v2 |
| 20 | with: | 20 | with: |
| 21 | submodules: true | 21 | submodules: true |
| 22 | 22 | ||
| 23 | - - uses: actions/setup-python@v1 | 23 | + - uses: actions/setup-python@v2 |
| 24 | 24 | ||
| 25 | - name: Make header | 25 | - name: Make header |
| 26 | run: python ./scripts/MakeSingleHeader.py CLI11.hpp | 26 | run: python ./scripts/MakeSingleHeader.py CLI11.hpp |
| @@ -37,12 +37,12 @@ jobs: | @@ -37,12 +37,12 @@ jobs: | ||
| 37 | cp build/CLI11-*-Source.* CLI11-Source | 37 | cp build/CLI11-*-Source.* CLI11-Source |
| 38 | cp build/CLI11-*-Source.* . | 38 | cp build/CLI11-*-Source.* . |
| 39 | 39 | ||
| 40 | - - uses: actions/upload-artifact@v1 | 40 | + - uses: actions/upload-artifact@v2 |
| 41 | with: | 41 | with: |
| 42 | name: CLI11.hpp | 42 | name: CLI11.hpp |
| 43 | path: CLI11.hpp | 43 | path: CLI11.hpp |
| 44 | 44 | ||
| 45 | - - uses: actions/upload-artifact@v1 | 45 | + - uses: actions/upload-artifact@v2 |
| 46 | with: | 46 | with: |
| 47 | name: CLI11-Source | 47 | name: CLI11-Source |
| 48 | path: CLI11-Source | 48 | path: CLI11-Source |
.github/workflows/tests.yml
| @@ -27,8 +27,8 @@ jobs: | @@ -27,8 +27,8 @@ jobs: | ||
| 27 | submodules: true | 27 | submodules: true |
| 28 | - name: Add wget | 28 | - name: Add wget |
| 29 | run: apt-get update && apt-get install -y wget | 29 | run: apt-get update && apt-get install -y wget |
| 30 | - - name: Install Modern CMake | ||
| 31 | - run: wget -qO- "https://cmake.org/files/v3.16/cmake-3.16.0-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local | 30 | + - name: Setup cmake |
| 31 | + uses: jwlawson/actions-setup-cmake@v1.3 | ||
| 32 | - name: Configure | 32 | - name: Configure |
| 33 | run: cmake -S . -B build -DCLI11_CUDA_TESTS=ON | 33 | run: cmake -S . -B build -DCLI11_CUDA_TESTS=ON |
| 34 | - name: Build | 34 | - name: Build |
| @@ -38,7 +38,7 @@ jobs: | @@ -38,7 +38,7 @@ jobs: | ||
| 38 | name: CMake config check | 38 | name: CMake config check |
| 39 | runs-on: ubuntu-latest | 39 | runs-on: ubuntu-latest |
| 40 | steps: | 40 | steps: |
| 41 | - - uses: actions/checkout@v1 | 41 | + - uses: actions/checkout@v2 |
| 42 | with: | 42 | with: |
| 43 | submodules: true | 43 | submodules: true |
| 44 | - name: CMake 3.4 | 44 | - name: CMake 3.4 |
| @@ -106,9 +106,14 @@ jobs: | @@ -106,9 +106,14 @@ jobs: | ||
| 106 | with: | 106 | with: |
| 107 | version: 3.16.8 | 107 | version: 3.16.8 |
| 108 | if: success() || failure() | 108 | if: success() || failure() |
| 109 | - - name: CMake 3.16 (full) | 109 | + - name: CMake 3.17 |
| 110 | uses: ./.github/actions/cmake_config | 110 | uses: ./.github/actions/cmake_config |
| 111 | with: | 111 | with: |
| 112 | version: 3.17.3 | 112 | version: 3.17.3 |
| 113 | + if: success() || failure() | ||
| 114 | + - name: CMake 3.18 (full) | ||
| 115 | + uses: ./.github/actions/cmake_config | ||
| 116 | + with: | ||
| 117 | + version: 3.18.0 | ||
| 113 | options: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON | 118 | options: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON |
| 114 | if: success() || failure() | 119 | if: success() || failure() |
.pre-commit-config.yaml
| 1 | 1 | ||
| 2 | repos: | 2 | repos: |
| 3 | - repo: https://github.com/psf/black | 3 | - repo: https://github.com/psf/black |
| 4 | - rev: 19.3b0 | 4 | + rev: 19.10b0 |
| 5 | hooks: | 5 | hooks: |
| 6 | - id: black | 6 | - id: black |
| 7 | - repo: https://github.com/pre-commit/pre-commit-hooks | 7 | - repo: https://github.com/pre-commit/pre-commit-hooks |
| 8 | - rev: v2.3.0 | 8 | + rev: v3.1.0 |
| 9 | hooks: | 9 | hooks: |
| 10 | - id: check-added-large-files | 10 | - id: check-added-large-files |
| 11 | - id: mixed-line-ending | 11 | - id: mixed-line-ending |