Skip to content

Commit 75116a7

Browse files
authored
fix(🗿): new Skia Graphite release (#3898)
1 parent d81c602 commit 75116a7

146 files changed

Lines changed: 7918 additions & 820 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/setup/action.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ inputs:
55
github_token:
66
description: 'GitHub Token'
77
required: false
8-
download_skia:
9-
description: 'Download Skia Binary Artifacts'
10-
required: false
11-
default: 'true'
128
graphite:
139
description: 'Use Graphite Skia Build'
1410
required: false
@@ -32,13 +28,11 @@ runs:
3228
- name: Install dependencies
3329
run: yarn install --immutable
3430
shell: bash
35-
env:
36-
SKIP_SKIA_DOWNLOAD: ${{ inputs.download_skia == 'false' && '1' || '' }}
3731

38-
- name: Copy Skia headers (standard build)
32+
- name: Install Skia (standard build)
3933
if: inputs.graphite != 'true'
4034
working-directory: packages/skia
41-
run: yarn copy-skia-headers
35+
run: yarn install-skia
4236
shell: bash
4337

4438
- name: Install Skia Graphite

‎.github/workflows/build-dawn.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
cancel-in-progress: true
88

99
env:
10-
DAWN_BRANCH: chromium/7770 # Configure the Dawn branch to checkout
10+
DAWN_BRANCH: chromium/7849 # Configure the Dawn branch to checkout
1111

1212
jobs:
1313
prepare-release:
@@ -19,7 +19,7 @@ jobs:
1919
release_name: ${{ steps.release_meta.outputs.release_name }}
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v6.0.2
22+
uses: actions/checkout@v6.0.3
2323

2424
- name: Determine Dawn branch metadata
2525
id: dawn_meta
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Create GitHub release
4747
id: create_release
48-
uses: softprops/action-gh-release@v2
48+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5151
with:
@@ -92,15 +92,15 @@ jobs:
9292
runs-on: ubuntu-latest
9393
steps:
9494
- name: Checkout main repository
95-
uses: actions/checkout@v6.0.2
95+
uses: actions/checkout@v6.0.3
9696

9797
- name: Checkout Dawn repository
9898
run: |
9999
git clone --depth 1 --branch ${{ env.DAWN_BRANCH }} https://dawn.googlesource.com/dawn externals/dawn
100100
101101
- name: Setup Android NDK
102102
id: setup-ndk
103-
uses: nttld/setup-ndk@v1
103+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0
104104
with:
105105
ndk-version: r27d
106106

@@ -117,6 +117,7 @@ jobs:
117117
-DCMAKE_BUILD_TYPE=Release \
118118
-DBUILD_SHARED_LIBS=OFF \
119119
-DDAWN_BUILD_MONOLITHIC_LIBRARY=SHARED \
120+
-DDAWN_BUILD_PROTOBUF=OFF \
120121
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
121122
-DCMAKE_EXE_LINKER_FLAGS="-llog" \
122123
-DCMAKE_SHARED_LINKER_FLAGS="-llog -Wl,-z,max-page-size=16384"
@@ -175,15 +176,15 @@ jobs:
175176
runs-on: macos-latest-large
176177
steps:
177178
- name: Checkout main repository
178-
uses: actions/checkout@v6.0.2
179+
uses: actions/checkout@v6.0.3
179180

180181
- name: Checkout Dawn repository
181182
run: |
182183
git clone --depth 1 --branch ${{ env.DAWN_BRANCH }} https://dawn.googlesource.com/dawn externals/dawn
183184
# submodules: true
184185

185186
- name: Setup Xcode
186-
uses: maxim-lobanov/setup-xcode@v1
187+
uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
187188
with:
188189
xcode-version: latest-stable
189190

@@ -200,7 +201,8 @@ jobs:
200201
-C externals/dawn/.github/workflows/dawn-ci.cmake \
201202
-DCMAKE_TOOLCHAIN_FILE=build-tools/apple.toolchain.cmake \
202203
${{ matrix.cmake_args }} \
203-
-DCMAKE_BUILD_TYPE=Release
204+
-DCMAKE_BUILD_TYPE=Release \
205+
-DDAWN_BUILD_PROTOBUF=OFF
204206
ninja -C ${{ matrix.output_dir }}
205207
- name: Upload build artifacts
206208
uses: actions/upload-artifact@v7
@@ -214,7 +216,7 @@ jobs:
214216
needs: [prepare-release, mobile-android, mobile-apple]
215217
steps:
216218
- name: Checkout main repository
217-
uses: actions/checkout@v6.0.2
219+
uses: actions/checkout@v6.0.3
218220

219221
- name: Download all build artifacts
220222
uses: actions/download-artifact@v8
@@ -263,7 +265,7 @@ jobs:
263265
tar -czf dawn-headers-${TAG}.tar.gz dawn-headers
264266
265267
- name: Upload to GitHub release
266-
uses: softprops/action-gh-release@v2
268+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
267269
env:
268270
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
269271
with:

‎.github/workflows/build-npm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
cancel-in-progress: true
1616
steps:
1717
- name: checkout
18-
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
18+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v5.0.0
1919
with:
2020
submodules: recursive
2121

@@ -38,7 +38,7 @@ jobs:
3838
NPM_CONFIG_PROVENANCE: true
3939

4040
- name: Deploy to GitHub Pages
41-
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
41+
uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0
4242
with:
4343
github_token: ${{ secrets.GITHUB_TOKEN }}
4444
publish_dir: ./apps/docs/build

‎.github/workflows/build-skia-graphite.yml‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ on:
1515
required: false
1616
type: boolean
1717
default: false
18-
skip_skia_download:
19-
description: 'Skip downloading prebuilt Skia (always true for building from source)'
20-
required: false
21-
type: boolean
22-
default: true
2318
jobs:
2419
prepare-release:
2520
runs-on: ubuntu-latest
@@ -30,7 +25,7 @@ jobs:
3025
release_name: ${{ steps.release_meta.outputs.release_name }}
3126
steps:
3227
- name: Checkout repository
33-
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v5.0.0
3429
with:
3530
submodules: recursive
3631
fetch-depth: 0
@@ -85,7 +80,7 @@ jobs:
8580
- name: Create GitHub release
8681
if: ${{ github.event.inputs.dry_run != 'true' }}
8782
id: create_release
88-
uses: softprops/action-gh-release@v2
83+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
8984
env:
9085
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9186
with:
@@ -124,7 +119,7 @@ jobs:
124119
fail-fast: false
125120
steps:
126121
- name: checkout
127-
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
122+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v5.0.0
128123
with:
129124
submodules: recursive
130125

@@ -140,7 +135,7 @@ jobs:
140135
- name: Setup Android NDK
141136
id: setup-ndk
142137
if: startsWith(matrix.target, 'android')
143-
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0
138+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0
144139
with:
145140
ndk-version: r27d
146141

@@ -149,12 +144,11 @@ jobs:
149144
run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV
150145

151146
- name: Setup Ninja
152-
uses: seanmiddleditch/gha-setup-ninja@master
147+
uses: seanmiddleditch/gha-setup-ninja@7e868db0f3406270dd46e1dac26c65f621456723 # master
153148

154149
- name: Setup
155150
uses: ./.github/actions/setup
156151
with:
157-
download_skia: ${{ github.event.inputs.skip_skia_download == 'true' && 'false' || 'true' }}
158152
github_token: ${{ secrets.GITHUB_TOKEN }}
159153

160154
- name: Update depot_tools
@@ -213,7 +207,7 @@ jobs:
213207

214208
- name: Upload binaries to GitHub release - ${{ matrix.artifact_name }}
215209
if: ${{ github.event.inputs.dry_run != 'true' }}
216-
uses: softprops/action-gh-release@v2
210+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
217211
env:
218212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
219213
with:
@@ -258,7 +252,7 @@ jobs:
258252

259253
- name: Upload Graphite Headers to GitHub release
260254
if: ${{ matrix.target == 'apple-ios' && github.event.inputs.dry_run != 'true' }}
261-
uses: softprops/action-gh-release@v2
255+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
262256
env:
263257
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
264258
with:

‎.github/workflows/build-skia.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ on:
1111
required: false
1212
type: boolean
1313
default: false
14-
skip_skia_download:
15-
description: 'Skip downloading prebuilt Skia (always true for building from source)'
16-
required: false
17-
type: boolean
18-
default: true
1914
jobs:
2015
prepare-release:
2116
runs-on: ubuntu-latest
@@ -26,7 +21,7 @@ jobs:
2621
release_name: ${{ steps.release_meta.outputs.release_name }}
2722
steps:
2823
- name: Checkout repository
29-
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
24+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v5.0.0
3025
with:
3126
submodules: recursive
3227
fetch-depth: 0
@@ -63,7 +58,7 @@ jobs:
6358
- name: Create GitHub release
6459
if: ${{ github.event.inputs.dry_run != 'true' }}
6560
id: create_release
66-
uses: softprops/action-gh-release@v2
61+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
6762
env:
6863
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6964
with:
@@ -103,24 +98,23 @@ jobs:
10398
fail-fast: false
10499
steps:
105100
- name: checkout
106-
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
101+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v5.0.0
107102
with:
108103
submodules: recursive
109104

110105
- name: Setup Android NDK
111106
id: setup-ndk
112107
if: startsWith(matrix.target, 'android')
113-
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0
108+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1.6.0
114109
with:
115110
ndk-version: r27c
116111

117112
- name: Setup Ninja
118-
uses: seanmiddleditch/gha-setup-ninja@master
113+
uses: seanmiddleditch/gha-setup-ninja@7e868db0f3406270dd46e1dac26c65f621456723 # master
119114

120115
- name: Setup
121116
uses: ./.github/actions/setup
122117
with:
123-
download_skia: ${{ github.event.inputs.skip_skia_download == 'true' && 'false' || 'true' }}
124118
github_token: ${{ secrets.GITHUB_TOKEN }}
125119

126120
- name: Update depot_tools
@@ -164,7 +158,7 @@ jobs:
164158

165159
- name: Upload binaries to GitHub release - ${{ matrix.artifact_name }}
166160
if: ${{ github.event.inputs.dry_run != 'true' }}
167-
uses: softprops/action-gh-release@v2
161+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
168162
env:
169163
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170164
with:

0 commit comments

Comments
 (0)