Skip to content

Commit 90a4e96

Browse files
committed
chore: extend ci matrix to include jobs for jsc-4.0 and jsc-6.0
Signed-off-by: Robert Günzler <[email protected]>
1 parent 65085e4 commit 90a4e96

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,57 @@ 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
3436
- os: ubuntu-latest
3537
cc: gcc
3638
cxx: g++
3739
type: static
3840
backend: JavaScriptCore
41+
javascriptcore_version: "4.0"
42+
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.0
3943
- os: ubuntu-latest
4044
cc: clang
4145
cxx: clang++
4246
type: shared
4347
backend: JavaScriptCore
48+
javascriptcore_version: "4.0"
49+
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.0
4450
- os: ubuntu-latest
4551
cc: gcc
4652
cxx: g++
4753
type: shared
4854
backend: JavaScriptCore
55+
javascriptcore_version: "4.0"
56+
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=4.0
57+
- os: ubuntu-latest
58+
cc: clang
59+
cxx: clang++
60+
type: static
61+
backend: JavaScriptCore
62+
javascriptcore_version: "6.0"
63+
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
64+
- os: ubuntu-latest
65+
cc: gcc
66+
cxx: g++
67+
type: static
68+
backend: JavaScriptCore
69+
javascriptcore_version: "6.0"
70+
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
71+
- os: ubuntu-latest
72+
cc: clang
73+
cxx: clang++
74+
type: shared
75+
backend: JavaScriptCore
76+
javascriptcore_version: "6.0"
77+
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
78+
- os: ubuntu-latest
79+
cc: gcc
80+
cxx: g++
81+
type: shared
82+
backend: JavaScriptCore
83+
javascriptcore_version: "6.0"
84+
options: -DINCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION:STRING=6.0
4985

5086
# Sanitizers
5187
- os: ubuntu-latest
@@ -82,7 +118,7 @@ jobs:
82118
if: runner.os == 'linux'
83119
run: |
84120
sudo apt-get update --yes
85-
sudo apt-get install --yes clang-format libjavascriptcoregtk-4.0-dev
121+
sudo apt-get install --yes clang-format libjavascriptcoregtk-${{ matrix.platform.javascriptcore_version }}-dev
86122
87123
# See https://github.com/actions/runner-images/issues/8659
88124
- name: Workaround Clang issue (GNU/Linux)

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ set(CMAKE_CXX_STANDARD 17)
1111

1212
# Options
1313
set(INCLUDEJS_BACKEND "JavaScriptCore" CACHE STRING "The IncludeJS Engine backend")
14+
option(INCLUDEJS_BACKEND_JAVASCRIPTCORE_API_VERSION "" CACHE STRING "Build IncludeJS against a specific version of JavaScriptCore (empty means no preference)")
1415
option(INCLUDEJS_ENGINE "Build the IncludeJS engine library" ON)
1516
option(INCLUDEJS_TESTS "Build the IncludeJS tests" OFF)
1617
option(INCLUDEJS_DOCS "Build the IncludeJS docs" OFF)

0 commit comments

Comments
 (0)