Skip to content

Commit 29767b2

Browse files
lemirelemire
authored
Moving gcc 7 out of circle ci (simdjson#1052)
1 parent 96a31c6 commit 29767b2

File tree

3 files changed

+45
-15
lines changed

3 files changed

+45
-15
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@ version: 2.1
22

33
# Reusable image / compiler definitions
44
executors:
5-
gcc7:
6-
docker:
7-
- image: gcc:7
8-
environment:
9-
CXX: g++
10-
CC: gcc
11-
BUILD_FLAGS: -j
12-
CTEST_FLAGS: -j4 --output-on-failure
13-
145
gcc8:
156
docker:
167
- image: conanio/gcc8
@@ -113,11 +104,6 @@ commands:
113104
jobs:
114105

115106
# static
116-
gcc7:
117-
description: Build and run tests on GCC 7 and AVX 2 with a cmake static build
118-
executor: gcc7
119-
environment: { CMAKE_FLAGS: -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON }
120-
steps: [ install_cmake, cmake_test, cmake_install_test ]
121107
justlib-gcc10:
122108
description: Build just the library, install it and do a basic test
123109
executor: gcc10
@@ -218,7 +204,7 @@ workflows:
218204
build_and_test:
219205
jobs:
220206
# full multi-implementation tests
221-
- gcc7
207+
#- gcc7 tested on GitHub actions
222208
- gcc10 # do not delete this as it tests our performance
223209
- clang6
224210
#- clang10 # this gets tested a lot below

‎.github/workflows/ubuntu18.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Ubuntu 18.04 CI (GCC 7)
2+
3+
on: [push]
4+
5+
jobs:
6+
ubuntu-build:
7+
runs-on: ubuntu-18.04
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Setup cmake
11+
uses: jwlawson/actions-setup-cmake@v1.0
12+
with:
13+
cmake-version: '3.9.x'
14+
- name: Use cmake
15+
run: |
16+
mkdir build &&
17+
cd build &&
18+
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
19+
cmake --build . &&
20+
ctest -j --output-on-failure . &&
21+
make install &&
22+
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json

‎.github/workflows/ubuntu20.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Ubuntu 20.04 CI (GCC 9)
2+
3+
on: [push]
4+
5+
jobs:
6+
ubuntu-build:
7+
runs-on: ubuntu-20.04
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Setup cmake
11+
uses: jwlawson/actions-setup-cmake@v1.0
12+
with:
13+
cmake-version: '3.9.x'
14+
- name: Use cmake
15+
run: |
16+
mkdir build &&
17+
cd build &&
18+
cmake -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX:PATH=destination .. &&
19+
cmake --build . &&
20+
ctest -j --output-on-failure . &&
21+
make install &&
22+
echo -e '#include <simdjson.h>\nint main(int argc,char**argv) {simdjson::dom::parser parser;simdjson::dom::element tweets = parser.load(argv[1]); }' > tmp.cpp && c++ -Idestination/include -Ldestination/lib -std=c++17 -Wl,-rpath,destination/lib -o linkandrun tmp.cpp -lsimdjson && ./linkandrun jsonexamples/twitter.json

0 commit comments

Comments
 (0)