Skip to content

Commit ec07a24

Browse files
authored
Merge pull request #16 from ByteHamster-etc/fix-ci
Fix CI build
2 parents f8073f3 + 6871f7f commit ec07a24

1 file changed

Lines changed: 17 additions & 14 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,34 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
config:
17-
# Run Tests on Ubuntu 18.04
18-
- name: "Ubuntu 18.04 Debug SQLite"
19-
os: ubuntu-18.04
17+
# Run Tests on Ubuntu 22.04
18+
- name: "Ubuntu 22.04 Debug SQLite"
19+
os: ubuntu-22.04
2020
build_type: "Debug"
2121
test_database: "sqlite"
2222

23-
- name: "Ubuntu 18.04 Release SQLite"
24-
os: ubuntu-18.04
23+
- name: "Ubuntu 22.04 Release SQLite"
24+
os: ubuntu-22.04
2525
build_type: "Release"
2626
test_database: "sqlite"
2727

28-
- name: "Ubuntu 18.04 Debug PostgreSQL"
29-
os: ubuntu-18.04
28+
- name: "Ubuntu 22.04 Debug PostgreSQL"
29+
os: ubuntu-22.04
3030
build_type: "Debug"
3131
test_database: "postgresql"
3232

33-
- name: "Ubuntu 18.04 Release PostgreSQL"
34-
os: ubuntu-18.04
33+
- name: "Ubuntu 22.04 Release PostgreSQL"
34+
os: ubuntu-22.04
3535
build_type: "Release"
3636
test_database: "postgresql"
3737

38-
- name: "Ubuntu 18.04 Debug MySQL"
39-
os: ubuntu-18.04
38+
- name: "Ubuntu 22.04 Debug MySQL"
39+
os: ubuntu-22.04
4040
build_type: "Debug"
4141
test_database: "mysql"
4242

43-
- name: "Ubuntu 18.04 Release MySQL"
44-
os: ubuntu-18.04
43+
- name: "Ubuntu 22.04 Release MySQL"
44+
os: ubuntu-22.04
4545
build_type: "Release"
4646
test_database: "mysql"
4747

@@ -73,14 +73,16 @@ jobs:
7373
os: macos-latest
7474
build_type: "Debug"
7575
test_database: "sqlite"
76+
cmake_flags: "-DWITH_POSTGRESQL=OFF"
7677

7778
- name: "macOS Release SQLite"
7879
os: macos-latest
7980
build_type: "Release"
8081
test_database: "sqlite"
82+
cmake_flags: "-DWITH_POSTGRESQL=OFF"
8183

8284
steps:
83-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v3
8486

8587
- name: Install Boost
8688
if: ${{startsWith(matrix.config.os, 'ubuntu')}}
@@ -115,6 +117,7 @@ jobs:
115117
-DCMAKE_CXX_FLAGS="${{matrix.config.cxx_flags}}"
116118
-DTEST_DATABASE="${{matrix.config.test_database}}"
117119
-DBUILD_EXAMPLES=ON
120+
${{matrix.config.cmake_flags}}
118121
119122
- name: Build
120123
run: cmake --build ${{github.workspace}}/build --config ${{matrix.config.build_type}}

0 commit comments

Comments
 (0)