Skip to content

Commit f6b6520

Browse files
Merge pull request #1033 from johnmcfarlane/fix-v1-ci
Fix v1.x CI
2 parents 2dde6e6 + be5a125 commit f6b6520

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
exceptions: "True"
157157
generator: "Ninja"
158158
int128: "False"
159-
linux-container: johnmcfarlane/cnl_ci:gcc-10
159+
linux-container: johnmcfarlane/cnl_ci:gcc-10-arm
160160
os-version: ubuntu-20.04
161161
sanitize: "False"
162162
std: 20
@@ -177,10 +177,6 @@ jobs:
177177
if: ( matrix.os == 'osx' )
178178
run: brew install conan gcc@10 ninja
179179

180-
- name: Install ARMv7 packages
181-
if: ( matrix.arch == 'armv7' )
182-
run: apt-get install --quiet --yes g++-10-arm-linux-gnueabi libboost-dev
183-
184180
- name: Initialise Conan
185181
run: |
186182
conan profile new default --detect && \
@@ -310,7 +306,7 @@ jobs:
310306

311307
# Install on mature Linux distro using only CMake
312308
linux-cmake-install:
313-
runs-on: ubuntu-16.04
309+
runs-on: ubuntu-18.04
314310
steps:
315311
- uses: actions/checkout@v2
316312

0 commit comments

Comments
 (0)