Skip to content

Commit 0129329

Browse files
committed
ci: make matrix entry the single source of jsc api version
Signed-off-by: Robert Günzler <[email protected]>
1 parent 5585d69 commit 0129329

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,57 +31,49 @@ jobs:
3131
cxx: clang++
3232
type: static
3333
backend: JavaScriptCore
34-
javascriptcore_version: "4.0"
35-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.0
34+
javascriptcore_api_version: "4.0"
3635
- os: ubuntu-latest
3736
cc: gcc
3837
cxx: g++
3938
type: static
4039
backend: JavaScriptCore
41-
javascriptcore_version: "4.0"
42-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.0
40+
javascriptcore_api_version: "4.0"
4341
- os: ubuntu-latest
4442
cc: clang
4543
cxx: clang++
4644
type: shared
4745
backend: JavaScriptCore
48-
javascriptcore_version: "4.0"
49-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.0
46+
javascriptcore_api_version: "4.0"
5047
- os: ubuntu-latest
5148
cc: gcc
5249
cxx: g++
5350
type: shared
5451
backend: JavaScriptCore
55-
javascriptcore_version: "4.0"
56-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.0
52+
javascriptcore_api_version: "4.0"
5753
- os: ubuntu-latest
5854
cc: clang
5955
cxx: clang++
6056
type: static
6157
backend: JavaScriptCore
62-
javascriptcore_version: "6.0"
63-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
58+
javascriptcore_api_version: "6.0"
6459
- os: ubuntu-latest
6560
cc: gcc
6661
cxx: g++
6762
type: static
6863
backend: JavaScriptCore
69-
javascriptcore_version: "6.0"
70-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
64+
javascriptcore_api_version: "6.0"
7165
- os: ubuntu-latest
7266
cc: clang
7367
cxx: clang++
7468
type: shared
7569
backend: JavaScriptCore
76-
javascriptcore_version: "6.0"
77-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
70+
javascriptcore_api_version: "6.0"
7871
- os: ubuntu-latest
7972
cc: gcc
8073
cxx: g++
8174
type: shared
8275
backend: JavaScriptCore
83-
javascriptcore_version: "6.0"
84-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
76+
javascriptcore_api_version: "6.0"
8577

8678
# Sanitizers
8779
- os: ubuntu-latest
@@ -90,16 +82,14 @@ jobs:
9082
type: static
9183
options: -DINCLUDEJS_ADDRESS_SANITIZER:BOOL=ON
9284
backend: JavaScriptCore
93-
javascriptcore_version: "6.0"
94-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.1
85+
javascriptcore_api_version: "4.0"
9586
- os: ubuntu-latest
9687
cc: clang
9788
cxx: clang++
9889
type: static
9990
options: -DINCLUDEJS_UNDEFINED_SANITIZER:BOOL=ON
10091
backend: JavaScriptCore
101-
javascriptcore_version: "6.0"
102-
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.1
92+
javascriptcore_api_version: "4.0"
10393
- os: macos-latest
10494
cc: clang
10595
cxx: clang++
@@ -122,7 +112,7 @@ jobs:
122112
if: runner.os == 'linux'
123113
run: |
124114
sudo apt-get update --yes
125-
sudo apt-get install --yes clang-format libjavascriptcoregtk-${{ matrix.platform.javascriptcore_version }}-dev
115+
sudo apt-get install --yes clang-format libjavascriptcoregtk-${{ matrix.platform.javascriptcore_api_version }}-dev
126116
127117
# See https://github.com/actions/runner-images/issues/8659
128118
- name: Workaround Clang issue (GNU/Linux)
@@ -145,6 +135,7 @@ jobs:
145135
cmake -S . -B ./build
146136
-DCMAKE_BUILD_TYPE:STRING=Release
147137
-DINCLUDEJS_BACKEND:STRING=${{ matrix.platform.backend }}
138+
-DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING={{ matrix.platform.javascriptcore_api_version }}
148139
-DINCLUDEJS_TESTS:BOOL=ON
149140
-DINCLUDEJS_DOCS:BOOL=OFF
150141
-DBUILD_SHARED_LIBS:BOOL=OFF
@@ -156,6 +147,7 @@ jobs:
156147
cmake -S . -B ./build
157148
-DCMAKE_BUILD_TYPE:STRING=Release
158149
-DINCLUDEJS_BACKEND:STRING=${{ matrix.platform.backend }}
150+
-DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING={{ matrix.platform.javascriptcore_api_version }}
159151
-DINCLUDEJS_TESTS:BOOL=ON
160152
-DINCLUDEJS_DOCS:BOOL=OFF
161153
-DBUILD_SHARED_LIBS:BOOL=ON

0 commit comments

Comments
 (0)