Peter M. Groen / CLI11

Commit fa423c45581c4b014db04c8491376f4acf9f6c1e

Authored by Henry Schreiner
Committed by Henry Schreiner
1 parent fdedfb64

ci: fix CMake config check

Inline Side-by-side
Showing 5 changed files with 117 additions and 91 deletions
.github/actions/cmake_config/Dockerfile deleted
View file @fdedfb6
1 -FROM ubuntu:18.04  
2 -  
3 -RUN apt-get update \  
4 - && apt-get install -y --no-install-recommends \  
5 - g++=4:7.4.0-1ubuntu2.3 \  
6 - wget=1.19.4-1ubuntu2.2 \  
7 - libidn11=1.33-2.1ubuntu1.2 \  
8 - ca-certificates=20180409 \  
9 - make=4.1-9.1ubuntu1 \  
10 - git=1:2.17.1-1ubuntu0.7 \  
11 - && apt-get clean \  
12 - && rm -rf /var/lib/apt/lists/*  
13 -  
14 -COPY entrypoint.sh /entrypoint.sh  
15 -  
16 -ENTRYPOINT ["/entrypoint.sh"]  
.github/actions/cmake_config/action.yml deleted
View file @fdedfb6
1 -description: 'Test out a bare bones configuration with a CMake version'  
2 -inputs:  
3 - version:  
4 - description: 'The full version of CMake to check'  
5 - required: true  
6 - options:  
7 - description: 'The CMake configuration options'  
8 - required: false  
9 - default: ""  
10 -name: 'Configure with CMake'  
11 -runs:  
12 - using: 'docker'  
13 - image: 'Dockerfile'  
14 - args:  
15 - - ${{ inputs.version }}  
16 - - ${{ inputs.options }}  
.github/actions/cmake_config/entrypoint.sh deleted
View file @fdedfb6
1 -#!/bin/bash -l  
2 -  
3 -set -ex  
4 -  
5 -mkdir -p cmake_dir  
6 -mkdir -p build_tmp  
7 -mkdir -p cmake_sources  
8 -rm -rf cmake_dir/* build_tmp/*  
9 -  
10 -v=$1  
11 -fn=cmake-$v-Linux-x86_64.tar.gz  
12 -  
13 -if [ ! -f cmake_sources/$fn ]; then  
14 - wget -qO cmake_sources/$fn "https://cmake.org/files/v${v%.*}/$fn"  
15 -fi  
16 -  
17 -tar -xzf cmake_sources/$fn --strip-components=1 -C $PWD/cmake_dir  
18 -  
19 -export PATH=$PWD/cmake_dir/bin:$PATH  
20 -  
21 -cmake --version  
22 -  
23 -cd build_tmp && cmake .. $2  
.github/actions/quick_cmake/action.yml 0 → 100644
  View file @fa423c4
  1 +name: Quick CMake config
  2 +description: 'Runs CMake 3.4+ (if already setup)'
  3 +inputs:
  4 + args:
  5 + description: 'Other arguments'
  6 + required: false
  7 + default: ''
  8 +
  9 +runs:
  10 + using: composite
  11 + steps:
  12 + - run: |
  13 + mkdir -p build-tmp
  14 + touch build-tmp/tmp
  15 + rm -r build-tmp/*
  16 + (cd build-tmp && cmake .. ${{ inputs.args}})
  17 + rm -r build-tmp
  18 + shell: bash
.github/workflows/tests.yml
  View file @fa423c4
@@ -39,81 +39,144 @@ jobs: @@ -39,81 +39,144 @@ jobs:
39 runs-on: ubuntu-latest 39 runs-on: ubuntu-latest
40 steps: 40 steps:
41 - uses: actions/checkout@v2 41 - uses: actions/checkout@v2
42 - with:  
43 - submodules: true 42 +
44 - name: CMake 3.4 43 - name: CMake 3.4
45 - uses: ./.github/actions/cmake_config 44 + uses: jwlawson/actions-setup-cmake@v1.8
46 with: 45 with:
47 - version: 3.4.3 46 + cmake-version: "3.4"
  47 + - name: Check CMake 3.4
  48 + uses: ./.github/actions/quick_cmake
  49 +
48 - name: CMake 3.5 50 - name: CMake 3.5
49 - uses: ./.github/actions/cmake_config 51 + uses: jwlawson/actions-setup-cmake@v1.8
50 with: 52 with:
51 - version: 3.5.2 53 + cmake-version: "3.5"
  54 + - name: Check CMake 3.5
  55 + uses: ./.github/actions/quick_cmake
52 if: success() || failure() 56 if: success() || failure()
  57 +
53 - name: CMake 3.6 58 - name: CMake 3.6
54 - uses: ./.github/actions/cmake_config 59 + uses: jwlawson/actions-setup-cmake@v1.8
55 with: 60 with:
56 - version: 3.6.3 61 + cmake-version: "3.6"
  62 + - name: Check CMake 3.6
  63 + uses: ./.github/actions/quick_cmake
57 if: success() || failure() 64 if: success() || failure()
  65 +
58 - name: CMake 3.7 66 - name: CMake 3.7
59 - uses: ./.github/actions/cmake_config 67 + uses: jwlawson/actions-setup-cmake@v1.8
60 with: 68 with:
61 - version: 3.7.2 69 + cmake-version: "3.7"
  70 + - name: Check CMake 3.7
  71 + uses: ./.github/actions/quick_cmake
62 if: success() || failure() 72 if: success() || failure()
  73 +
63 - name: CMake 3.8 74 - name: CMake 3.8
64 - uses: ./.github/actions/cmake_config 75 + uses: jwlawson/actions-setup-cmake@v1.8
65 with: 76 with:
66 - version: 3.8.2 77 + cmake-version: "3.8"
  78 + - name: Check CMake 3.8
  79 + uses: ./.github/actions/quick_cmake
67 if: success() || failure() 80 if: success() || failure()
  81 +
68 - name: CMake 3.9 82 - name: CMake 3.9
69 - uses: ./.github/actions/cmake_config 83 + uses: jwlawson/actions-setup-cmake@v1.8
70 with: 84 with:
71 - version: 3.9.6 85 + cmake-version: "3.9"
  86 + - name: Check CMake 3.9
  87 + uses: ./.github/actions/quick_cmake
72 if: success() || failure() 88 if: success() || failure()
  89 +
73 - name: CMake 3.10 90 - name: CMake 3.10
74 - uses: ./.github/actions/cmake_config 91 + uses: jwlawson/actions-setup-cmake@v1.8
75 with: 92 with:
76 - version: 3.10.3 93 + cmake-version: "3.10"
  94 + - name: Check CMake 3.10
  95 + uses: ./.github/actions/quick_cmake
77 if: success() || failure() 96 if: success() || failure()
78 - - name: CMake 3.11 (full)  
79 - uses: ./.github/actions/cmake_config 97 +
  98 + - name: CMake 3.11
  99 + uses: jwlawson/actions-setup-cmake@v1.8
  100 + with:
  101 + cmake-version: "3.11"
  102 + - name: Check CMake 3.11 (full)
  103 + uses: ./.github/actions/quick_cmake
80 with: 104 with:
81 - version: 3.11.4  
82 - options: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON 105 + args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
83 if: success() || failure() 106 if: success() || failure()
  107 +
84 - name: CMake 3.12 108 - name: CMake 3.12
85 - uses: ./.github/actions/cmake_config 109 + uses: jwlawson/actions-setup-cmake@v1.8
86 with: 110 with:
87 - version: 3.12.4 111 + cmake-version: "3.12"
  112 + - name: Check CMake 3.12
  113 + uses: ./.github/actions/quick_cmake
88 if: success() || failure() 114 if: success() || failure()
  115 +
89 - name: CMake 3.13 116 - name: CMake 3.13
90 - uses: ./.github/actions/cmake_config 117 + uses: jwlawson/actions-setup-cmake@v1.8
91 with: 118 with:
92 - version: 3.13.5 119 + cmake-version: "3.13"
  120 + - name: Check CMake 3.13
  121 + uses: ./.github/actions/quick_cmake
93 if: success() || failure() 122 if: success() || failure()
  123 +
94 - name: CMake 3.14 124 - name: CMake 3.14
95 - uses: ./.github/actions/cmake_config 125 + uses: jwlawson/actions-setup-cmake@v1.8
96 with: 126 with:
97 - version: 3.14.7 127 + cmake-version: "3.14"
  128 + - name: Check CMake 3.14
  129 + uses: ./.github/actions/quick_cmake
98 if: success() || failure() 130 if: success() || failure()
  131 +
99 - name: CMake 3.15 132 - name: CMake 3.15
100 - uses: ./.github/actions/cmake_config 133 + uses: jwlawson/actions-setup-cmake@v1.8
101 with: 134 with:
102 - version: 3.15.6 135 + cmake-version: "3.15"
  136 + - name: Check CMake 3.15
  137 + uses: ./.github/actions/quick_cmake
103 if: success() || failure() 138 if: success() || failure()
  139 +
104 - name: CMake 3.16 140 - name: CMake 3.16
105 - uses: ./.github/actions/cmake_config 141 + uses: jwlawson/actions-setup-cmake@v1.8
106 with: 142 with:
107 - version: 3.16.8 143 + cmake-version: "3.16"
  144 + - name: Check CMake 3.16
  145 + uses: ./.github/actions/quick_cmake
108 if: success() || failure() 146 if: success() || failure()
  147 +
109 - name: CMake 3.17 148 - name: CMake 3.17
110 - uses: ./.github/actions/cmake_config 149 + uses: jwlawson/actions-setup-cmake@v1.8
  150 + with:
  151 + cmake-version: "3.17"
  152 + - name: Check CMake 3.17
  153 + uses: ./.github/actions/quick_cmake
  154 + if: success() || failure()
  155 +
  156 + - name: CMake 3.18
  157 + uses: jwlawson/actions-setup-cmake@v1.8
111 with: 158 with:
112 - version: 3.17.3 159 + cmake-version: "3.18"
  160 + - name: Check CMake 3.18
  161 + uses: ./.github/actions/quick_cmake
113 if: success() || failure() 162 if: success() || failure()
114 - - name: CMake 3.18 (full)  
115 - uses: ./.github/actions/cmake_config 163 +
  164 + - name: CMake 3.19
  165 + uses: jwlawson/actions-setup-cmake@v1.8
  166 + with:
  167 + cmake-version: "3.19"
  168 + - name: Check CMake 3.19 (full)
  169 + uses: ./.github/actions/quick_cmake
116 with: 170 with:
117 - version: 3.18.0  
118 - options: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON 171 + args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
119 if: success() || failure() 172 if: success() || failure()
  173 +
  174 + - name: CMake 3.20
  175 + uses: jwlawson/actions-setup-cmake@v1.8
  176 + with:
  177 + cmake-version: "3.20"
  178 + - name: Check CMake 3.20
  179 + uses: ./.github/actions/quick_cmake
  180 + if: success() || failure()
  181 +
  182 +