Skip to content

Commit 1e37abc

Browse files
authored
bring CI builds up to date (#361)
* update actions stuff * update keychain submodule
1 parent b749075 commit 1e37abc

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
submodules: true
140140

141141
- name: Fetch CMake
142-
uses: lukka/get-cmake@v3.21.2
142+
uses: lukka/get-cmake@latest
143143

144144
- name: Fetch dependencies
145145
run: |
@@ -153,16 +153,15 @@ jobs:
153153
brew install libhandy
154154
155155
- name: Build
156-
uses: lukka/run-cmake@v3
157-
with:
158-
buildDirectory: ${{ runner.workspace }}/build
159-
cmakeBuildType: ${{ matrix.buildtype }}
156+
run: |
157+
cmake -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }}
158+
cmake --build build
160159
161160
- name: Setup artifact files
162161
run: |
163162
artifact_dir=build/artifactdir/abaddon-${{ matrix.buildtype }}-${GITHUB_SHA::7}
164163
mkdir -p "${artifact_dir}"
165-
cp "${{runner.workspace}}/build/abaddon" "${artifact_dir}/abaddon"
164+
cp "${{ github.workspace }}/build/abaddon" "${artifact_dir}/abaddon"
166165
cp -r "${{ github.workspace }}/res/css" "${artifact_dir}/css"
167166
cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res"
168167
@@ -184,7 +183,7 @@ jobs:
184183
submodules: true
185184

186185
- name: Fetch CMake
187-
uses: lukka/get-cmake@v3.21.2
186+
uses: lukka/get-cmake@latest
188187

189188
- name: Fetch dependencies
190189
run: |
@@ -193,7 +192,7 @@ jobs:
193192
cd deps
194193
git clone https://github.com/nlohmann/json
195194
cd json
196-
git checkout bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
195+
git checkout 55f93686c01528224f448c19128836e7df245f72
197196
mkdir build
198197
cd build
199198
cmake ..
@@ -207,20 +206,18 @@ jobs:
207206
sudo apt-get install libhandy-1-dev
208207
209208
- name: Build
210-
uses: lukka/run-cmake@v3
211209
env:
212210
CC: gcc-9
213211
CXX: g++-9
214-
with:
215-
cmakeAppendedArgs: -DCMAKE_C_COMPILER=gcc-9 -DCMAKE_CXX_COMPILER=g++-9
216-
buildDirectory: ${{ runner.workspace }}/build
217-
cmakeBuildType: ${{ matrix.buildtype }}
212+
run: |
213+
cmake -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }}
214+
cmake --build build
218215
219216
- name: Setup artifact files
220217
run: |
221218
artifact_dir=${{ runner.workspace }}/artifactdir/abaddon-${{ matrix.buildtype }}-${GITHUB_SHA::7}
222219
mkdir -p "${artifact_dir}"
223-
cp "${{runner.workspace}}/build/abaddon" "${artifact_dir}/abaddon"
220+
cp "${{ github.workspace }}/build/abaddon" "${artifact_dir}/abaddon"
224221
cp -r "${{ github.workspace }}/res/css" "${artifact_dir}/css"
225222
cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res"
226223

0 commit comments

Comments
 (0)