Skip to content

Commit c156766

Browse files
Merge branch 'web-widget'
2 parents bbd5424 + 952af5a commit c156766

2 files changed

Lines changed: 30 additions & 32 deletions

File tree

.github/workflows/build-webview-helper.yml

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
permissions:
99
contents: write
1010

11+
env:
12+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
13+
1114
jobs:
1215
build-linux:
1316
runs-on: ubuntu-latest
@@ -21,44 +24,37 @@ jobs:
2124
run: cd src/lib/webview_helper && bash build.sh
2225

2326
- name: Upload artifact
24-
uses: actions/upload-artifact@v5
27+
uses: actions/upload-artifact@v4
2528
with:
2629
name: webview_helper_linux_x86_64
2730
path: src/lib/webview_helper_linux_x86_64
2831

29-
build-macos-intel:
30-
runs-on: macos-13
31-
steps:
32-
- uses: actions/checkout@v5
33-
34-
- name: Install CMake
35-
run: brew install cmake || true
36-
37-
- name: Build helper binary
38-
run: cd src/lib/webview_helper && bash build.sh
39-
40-
- name: Upload artifact
41-
uses: actions/upload-artifact@v5
42-
with:
43-
name: webview_helper_darwin_x86_64
44-
path: src/lib/webview_helper_darwin_x86_64
45-
46-
build-macos-arm:
32+
build-macos:
4733
runs-on: macos-latest
34+
strategy:
35+
matrix:
36+
include:
37+
- arch: arm64
38+
cmake_arch: arm64
39+
binary_name: webview_helper_darwin_arm64
40+
- arch: x86_64
41+
cmake_arch: x86_64
42+
binary_name: webview_helper_darwin_x86_64
4843
steps:
4944
- uses: actions/checkout@v5
5045

51-
- name: Install CMake
52-
run: brew install cmake || true
53-
54-
- name: Build helper binary
55-
run: cd src/lib/webview_helper && bash build.sh
46+
- name: Build helper binary (${{ matrix.arch }})
47+
run: |
48+
cd src/lib/webview_helper
49+
mkdir -p build && cd build
50+
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.cmake_arch }}
51+
cmake --build . --config Release
5652
5753
- name: Upload artifact
58-
uses: actions/upload-artifact@v5
54+
uses: actions/upload-artifact@v4
5955
with:
60-
name: webview_helper_darwin_arm64
61-
path: src/lib/webview_helper_darwin_arm64
56+
name: ${{ matrix.binary_name }}
57+
path: src/lib/${{ matrix.binary_name }}
6258

6359
build-windows:
6460
runs-on: windows-latest
@@ -75,26 +71,25 @@ jobs:
7571
cmake --build . --config Release
7672
7773
- name: Upload artifact
78-
uses: actions/upload-artifact@v5
74+
uses: actions/upload-artifact@v4
7975
with:
8076
name: webview_helper_windows_x86_64.exe
8177
path: src/lib/webview_helper_windows_x86_64.exe
8278

8379
release:
84-
needs: [build-linux, build-macos-intel, build-macos-arm, build-windows]
80+
needs: [build-linux, build-macos, build-windows]
8581
runs-on: ubuntu-latest
8682
steps:
8783
- name: Download all artifacts
88-
uses: actions/download-artifact@v5
84+
uses: actions/download-artifact@v4
8985
with:
9086
path: binaries
9187
merge-multiple: true
9288

9389
- name: List binaries
9490
run: ls -la binaries/
9591

96-
- name: Create GitHub Release
92+
- name: Upload binaries to release
9793
uses: softprops/action-gh-release@v2
9894
with:
99-
generate_release_notes: true
10095
files: binaries/*

.github/workflows/tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
pull_request:
77
branches: [main]
88

9+
env:
10+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
11+
912
jobs:
1013
test-linux:
1114
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)