Skip to content

Commit f8d17b1

Browse files
authored
Use gcc9 and ubuntu-20.04 (#723)
1 parent f77c7cf commit f8d17b1

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/ci-cmake.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [ubuntu-18.04]
22+
os: [ubuntu-20.04]
2323
build_type: [Debug, Release]
24-
compiler_version: [7]
24+
compiler_version: [9]
2525
shared_libs: [ON, OFF]
2626
timeout-minutes: 35
2727

2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v3
3030
- name: Install prerequisites
3131
run: |
3232
sudo apt-get install -y --no-install-recommends \
@@ -61,7 +61,7 @@ jobs:
6161
cmake --build build --target install
6262
cmake --build build --target install-doc
6363
- name: Upload artifact
64-
uses: actions/upload-artifact@v2
64+
uses: actions/upload-artifact@v3
6565
with:
6666
name: libcosim-${{ runner.os }}-${{ matrix.build_type }}-gcc${{ matrix.compiler_version }}
6767
path: install
@@ -79,7 +79,7 @@ jobs:
7979
timeout-minutes: 35
8080

8181
steps:
82-
- uses: actions/checkout@v2
82+
- uses: actions/checkout@v3
8383
- name: Install prerequisites
8484
run: |
8585
pip3 install --upgrade setuptools pip
@@ -110,7 +110,7 @@ jobs:
110110
cmake --build build --config ${{ matrix.build_type }} --target install
111111
cmake --build build --config ${{ matrix.build_type }} --target install-doc
112112
- name: Upload artifact
113-
uses: actions/upload-artifact@v2
113+
uses: actions/upload-artifact@v3
114114
with:
115115
name: libcosim-${{ runner.os }}-${{ matrix.build_type }}
116116
path: install

.github/workflows/ci-conan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
build_type: [Debug, Release]
14-
compiler_version: [7, 9]
14+
compiler_version: [9]
1515
compiler_libcxx: [libstdc++11]
1616
option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False']
1717
option_shared: ['shared=True', 'shared=False']
1818
timeout-minutes: 35
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222
- name: Generate Dockerfile
2323
run: |
2424
mkdir /tmp/osp-builder-docker
@@ -81,7 +81,7 @@ jobs:
8181
timeout-minutes: 35
8282

8383
steps:
84-
- uses: actions/checkout@v2
84+
- uses: actions/checkout@v3
8585
- name: Install prerequisites
8686
run: |
8787
pip3 install --upgrade setuptools pip

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ endforeach()
154154

155155
add_library(cosim ${publicHeadersFull} ${privateHeaders} ${sources} ${generatedFiles})
156156

157-
target_compile_definitions(cosim PUBLIC "BOOST_ALL_NO_LIB=0" "BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE=1")
157+
target_compile_definitions(cosim PUBLIC "BOOST_ALL_NO_LIB" "BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE=1")
158158
if(NOT Boost_USE_STATIC_LIBS)
159159
target_compile_definitions(cosim PUBLIC "BOOST_ALL_DYN_LINK=1")
160160
endif()

0 commit comments

Comments
 (0)