-
Notifications
You must be signed in to change notification settings - Fork 482
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Revamp CMake support #1118
base: master
Are you sure you want to change the base?
Revamp CMake support #1118
Changes from all commits
0d85e89
9e7c5db
579a099
c2dcce7
4a378ed
926bfbb
1ccc218
ec64b18
1489077
074bdf2
456a8cc
bb86d44
0e5c799
f49841c
b593a29
672213c
207e17e
dd5e3dd
cd401e4
1564540
342bcb4
646f2fe
921ca59
1353f18
eaf2994
3540780
980d4c9
5214951
501be49
e96633a
ec3984e
f5ab470
241af7d
5f65bb5
5150a51
acd1294
aea1958
47c05f3
e2c1a53
a868715
9defe9b
35f0f92
b7d56a0
baecbb2
eba5926
fa97a69
f9b1805
f4af355
e255daa
9e123c6
8bceabe
d611b7d
1efdcce
b111ec1
7bcdd9a
24feb96
1098208
2de4a69
f38e222
81cd483
d5f70a1
7071264
c4895b3
9231cd0
1252be7
1e0e1dd
c616644
e8cc701
8283a38
b6b31be
08eb273
21515f2
a2faea6
6a106e7
f4e01a4
8d14ee4
a74341c
6b6db13
efe3a05
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,54 +22,43 @@ on: | |
|
||
jobs: | ||
build: | ||
runs-on: ${{ matrix.runner || 'ubuntu-22.04' }} | ||
container: ${{ matrix.container }} | ||
name: ${{ matrix.name }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
lib_type: [shared, static] | ||
# Can't test DB2 as required db2exc package is no longer available after Ubuntu 14.04 | ||
backend: [sqlite3, postgresql, mysql, firebird, oracle, odbc, empty, valgrind] | ||
runner: [ubuntu-22.04] | ||
cxxstd: [14] | ||
test_release_package: [false] | ||
build_examples: [false] | ||
Comment on lines
+33
to
+34
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just out of curiosity, why do we define these ones here but not |
||
include: | ||
# Note: the jobs are ordered in the order of decreasing running | ||
# time, as this should minimize the total run-time of all jobs. | ||
- backend: postgresql | ||
- backend: empty | ||
runner: macos-12 | ||
name: PostgreSQL macOS | ||
- backend: oracle | ||
name: Oracle 11 | ||
no_boost: true | ||
- backend: valgrind | ||
name: Valgrind | ||
- backend: odbc | ||
# There are many leak reports under Ubuntu 22.04, see #1008. | ||
container: ubuntu:18.04 | ||
name: ODBC | ||
- backend: firebird | ||
name: Firebird | ||
- backend: postgresql | ||
name: PostgreSQL Linux | ||
- backend: mysql | ||
name: MySQL | ||
- backend: sqlite3 | ||
runner: macos-12 | ||
name: SQLite3 macOS | ||
- backend: sqlite3 | ||
name: SQLite3 C++17 | ||
cxxstd: 17 | ||
no_boost: true | ||
- backend: sqlite3 | ||
name: SQLite3 | ||
- backend: empty | ||
runner: macos-12 | ||
name: Empty macOS | ||
- backend: empty | ||
name: Empty | ||
no_boost: true | ||
- backend: oracle | ||
no_boost: true | ||
runner: ubuntu-22.04 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems redundant as this is the default anyhow? (also below) |
||
- name: SQLite3 Cxx17 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
backend: sqlite3 | ||
cxxstd: 17 | ||
runner: ubuntu-22.04 | ||
- name: Release package | ||
backend: empty | ||
test_release_package: true | ||
# Unsupported: db2exc package is only available in Ubuntu 14.04 not | ||
# supported by GitHub Actions any longer, we'd need to run it in | ||
# Docker container if we really need it. | ||
# backend: db2 | ||
- backend: empty | ||
name: Examples | ||
runner: ubuntu-22.04 | ||
- name: Examples | ||
backend: empty | ||
build_examples: true | ||
runner: ubuntu-22.04 | ||
|
||
runs-on: ${{ matrix.runner }} | ||
|
||
env: | ||
SOCI_CI: true | ||
|
@@ -120,14 +109,6 @@ jobs: | |
;; | ||
esac | ||
|
||
case "${{matrix.container}}" in | ||
ubuntu:18.04) | ||
# We need to use this option as GitHub certificate is not recognized by | ||
# wget in this old container otherwise. | ||
set_env_var SOCI_WGET_OPTIONS --no-check-certificate | ||
;; | ||
esac | ||
|
||
if [ -n "${{matrix.cxxstd}}" ]; then | ||
set_env_var SOCI_CXXSTD ${{matrix.cxxstd}} | ||
fi | ||
|
@@ -140,6 +121,9 @@ jobs: | |
if [ "${{matrix.build_examples}}" = true ]; then | ||
set_env_var BUILD_EXAMPLES YES | ||
fi | ||
if [ "${{matrix.lib_type}}" = "static" ]; then | ||
set_env_var SOCI_BUILD_STATIC YES | ||
fi | ||
|
||
- name: Install dependencies under Linux | ||
if: runner.os == 'Linux' | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doubles the number of builds and I'm not sure if it's worth it... Maybe it would be enough to test just some static builds instead of testing all of them?