Skip to content

Commit 802e4b5

Browse files
authored
Make it compile for Ubuntu 22.04 (#65)
* Remove warning as error for useless cast for now * Add ubuntu-22.04 to pipeline * Make more clearer naming for circleci
1 parent 4d2f73d commit 802e4b5

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

.circleci/config.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2
22
jobs:
3-
build:
3+
build-ubuntu-18.04:
44
docker:
55
- image: heliconwave/circleci-ubuntu-18.04:latest
66
steps:
@@ -34,7 +34,7 @@ jobs:
3434
paths:
3535
- Debug
3636
- Release
37-
build-16.04:
37+
build-ubuntu-16.04:
3838
docker:
3939
- image: heliconwave/circleci-ubuntu-16.04:latest
4040
steps:
@@ -76,7 +76,7 @@ jobs:
7676
# - run:
7777
# name: Build CMake WebAssembly
7878
# command: cd /root/project && em++ --version && pwd && rm -rf build/ && mkdir build && cd build/ && emcmake cmake -DCMAKE_CXX_STANDARD=11 -DENABLE_TESTS=OFF -DENABLE_WEBASSEMBLY=ON .. && cmake --build . -- -j$(nproc)
79-
test-unit:
79+
test-unit-u18.04:
8080
docker:
8181
- image: heliconwave/circleci-ubuntu-18.04:latest
8282
working_directory: ~/project
@@ -87,7 +87,7 @@ jobs:
8787
- run:
8888
name: Run CTest
8989
command: pwd && ls -ltrha && cd Debug/ && make unit-tests
90-
test-unit-16.04:
90+
test-unit-u16.04:
9191
docker:
9292
- image: heliconwave/circleci-ubuntu-16.04:latest
9393
working_directory: ~/project
@@ -133,21 +133,21 @@ workflows:
133133
version: 2
134134
build-test-and-deploy:
135135
jobs:
136-
- build
137-
- build-16.04
136+
- build-ubuntu-18.04
137+
- build-ubuntu-16.04
138138
# - build-webassembly
139-
- test-unit:
139+
- test-unit-u18.04:
140140
requires:
141-
- build
142-
- test-unit-16.04:
141+
- build-ubuntu-18.04
142+
- test-unit-u16.04:
143143
requires:
144-
- build-16.04
144+
- build-ubuntu-16.04
145145
- test-component:
146146
requires:
147-
- build
147+
- build-ubuntu-18.04
148148
- test-benchmark:
149149
requires:
150-
- build
150+
- build-ubuntu-18.04
151151
- test-memcheck:
152152
requires:
153-
- build
153+
- build-ubuntu-18.04

.github/workflows/ccpp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
os: [macos-latest, windows-latest]
11+
os: [macos-latest, windows-latest, ubuntu-22.04]
1212
steps:
1313
- uses: actions/checkout@v1
1414
- name: check versions

CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ endif()
131131
#-------------------
132132
# compiler settings
133133
#-------------------
134-
if(NOT ENABLE_WEBASSEMBLY)
135-
if (UNIX AND NOT APPLE)
136-
add_compile_options(-Wuseless-cast # warn if you perform a cast to the same type
137-
-Werror # Make the specified warning into an error.
138-
)
139-
endif()
140-
endif()
134+
#if(NOT ENABLE_WEBASSEMBLY)
135+
# if (UNIX AND NOT APPLE)
136+
# add_compile_options(-Wuseless-cast # warn if you perform a cast to the same type
137+
# -Werror # Make the specified warning into an error.
138+
# )
139+
# endif()
140+
#endif()
141141

142142
if (MSVC)
143143
add_compile_options(/W4)

0 commit comments

Comments
 (0)