Skip to content

Commit e96c621

Browse files
wcandillonwcandillon
authored
Merge branch 'main' into wcandillon-patch-11
2 parents 4a109e2 + 7e6a3e2 commit e96c621

File tree

34 files changed

+590
-55
lines changed

34 files changed

+590
-55
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
release_name: ${{ steps.release_meta.outputs.release_name }}
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/[email protected].1
22+
uses: actions/[email protected].2
2323

2424
- name: Determine Dawn branch metadata
2525
id: dawn_meta
@@ -92,7 +92,7 @@ jobs:
9292
runs-on: ubuntu-latest
9393
steps:
9494
- name: Checkout main repository
95-
uses: actions/[email protected].1
95+
uses: actions/[email protected].2
9696

9797
- name: Checkout Dawn repository
9898
run: |
@@ -175,7 +175,7 @@ jobs:
175175
runs-on: macos-latest-large
176176
steps:
177177
- name: Checkout main repository
178-
uses: actions/[email protected].1
178+
uses: actions/[email protected].2
179179

180180
- name: Checkout Dawn repository
181181
run: |
@@ -214,7 +214,7 @@ jobs:
214214
needs: [prepare-release, mobile-android, mobile-apple]
215215
steps:
216216
- name: Checkout main repository
217-
uses: actions/[email protected].1
217+
uses: actions/[email protected].2
218218

219219
- name: Download all build artifacts
220220
uses: actions/download-artifact@v7

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

Lines changed: 1 addition & 1 deletion
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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
18+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
1919
with:
2020
submodules: recursive
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
release_name: ${{ steps.release_meta.outputs.release_name }}
1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
14+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
1515
with:
1616
submodules: recursive
1717
fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
8080
fail-fast: false
8181
steps:
8282
- name: checkout
83-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
83+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
8484
with:
8585
submodules: recursive
8686

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
release_name: ${{ steps.release_meta.outputs.release_name }}
1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
14+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
1515
with:
1616
submodules: recursive
1717
fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
8080
fail-fast: false
8181
steps:
8282
- name: checkout
83-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
83+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
8484
with:
8585
submodules: recursive
8686

‎.github/workflows/ci-graphite.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
TURBO_CACHE_DIR: .turbo/android
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
26+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
2727
with:
2828
submodules: recursive
2929

@@ -46,7 +46,7 @@ jobs:
4646
df -h
4747
4848
- name: Cache turborepo for Android
49-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
49+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
5050
with:
5151
path: ${{ env.TURBO_CACHE_DIR }}
5252
key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
@@ -77,7 +77,7 @@ jobs:
7777
echo "sdk.dir=$ANDROID_HOME" > $GITHUB_WORKSPACE/apps/example/android/local.properties
7878
7979
- name: Cache Gradle
80-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
80+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
8181
with:
8282
path: |
8383
~/.gradle/wrapper
@@ -93,7 +93,7 @@ jobs:
9393
yarn turbo run build:android --concurrency 1
9494
9595
- name: Cache apk
96-
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
96+
uses: actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
9797
env:
9898
cache-name: cache-apk
9999
with:
@@ -114,7 +114,7 @@ jobs:
114114
TURBO_CACHE_DIR: .turbo/android
115115
steps:
116116
- name: checkout
117-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
117+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
118118
with:
119119
submodules: recursive
120120

@@ -142,7 +142,7 @@ jobs:
142142
143143
- name: Restore APK
144144
id: cache-apk
145-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb
145+
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7
146146
with:
147147
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
148148
key: apk-graphite-${{ github.sha }}
@@ -189,7 +189,7 @@ jobs:
189189
TURBO_CACHE_DIR: .turbo/ios
190190
steps:
191191
- name: Checkout
192-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
192+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
193193
with:
194194
submodules: recursive
195195

@@ -200,7 +200,7 @@ jobs:
200200
graphite: true
201201

202202
- name: Cache turborepo for iOS
203-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
203+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
204204
with:
205205
path: ${{ env.TURBO_CACHE_DIR }}
206206
key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
24+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
2525
with:
2626
submodules: recursive
2727

@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
github_token: ${{ secrets.GITHUB_TOKEN }}
3232

33-
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
33+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3434
- run: pip install cpplint
3535
- run: cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=package/cpp/skia --exclude=package/apple --exclude=package/android/build --exclude=package/node_modules --recursive package
3636

@@ -60,7 +60,7 @@ jobs:
6060
runs-on: macos-latest
6161
steps:
6262
- name: Checkout
63-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
63+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
6464
with:
6565
submodules: recursive
6666

@@ -78,7 +78,7 @@ jobs:
7878
run_id: ${{ github.run_id }}
7979
steps:
8080
- name: Checkout
81-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
81+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
8282
with:
8383
submodules: recursive
8484

@@ -121,7 +121,7 @@ jobs:
121121
runs-on: windows-latest
122122
steps:
123123
- name: Checkout
124-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
124+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
125125
with:
126126
submodules: recursive
127127

@@ -139,7 +139,7 @@ jobs:
139139
TURBO_CACHE_DIR: .turbo/android
140140
steps:
141141
- name: Checkout
142-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
142+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
143143
with:
144144
submodules: recursive
145145

@@ -161,7 +161,7 @@ jobs:
161161
df -h
162162
163163
- name: Cache turborepo for Android
164-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
164+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
165165
with:
166166
path: ${{ env.TURBO_CACHE_DIR }}
167167
key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
@@ -192,7 +192,7 @@ jobs:
192192
echo "sdk.dir=$ANDROID_HOME" > $GITHUB_WORKSPACE/apps/example/android/local.properties
193193
194194
- name: Cache Gradle
195-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
195+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
196196
with:
197197
path: |
198198
~/.gradle/wrapper
@@ -208,7 +208,7 @@ jobs:
208208
yarn turbo run build:android --concurrency 1
209209
210210
- name: Cache apk
211-
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
211+
uses: actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
212212
env:
213213
cache-name: cache-apk
214214
with:
@@ -229,7 +229,7 @@ jobs:
229229
TURBO_CACHE_DIR: .turbo/android
230230
steps:
231231
- name: checkout
232-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
232+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
233233
with:
234234
submodules: recursive
235235

@@ -256,7 +256,7 @@ jobs:
256256
257257
- name: Restore APK
258258
id: cache-apk
259-
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb
259+
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7
260260
with:
261261
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
262262
key: apk-${{ github.sha }}
@@ -303,7 +303,7 @@ jobs:
303303
TURBO_CACHE_DIR: .turbo/ios
304304
steps:
305305
- name: Checkout
306-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
306+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
307307
with:
308308
submodules: recursive
309309

@@ -313,7 +313,7 @@ jobs:
313313
github_token: ${{ secrets.GITHUB_TOKEN }}
314314

315315
- name: Cache turborepo for iOS
316-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
316+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
317317
with:
318318
path: ${{ env.TURBO_CACHE_DIR }}
319319
key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}
@@ -350,7 +350,7 @@ jobs:
350350
TURBO_CACHE_DIR: .turbo/macos
351351
steps:
352352
- name: Checkout
353-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
353+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
354354
with:
355355
submodules: recursive
356356

@@ -360,7 +360,7 @@ jobs:
360360
github_token: ${{ secrets.GITHUB_TOKEN }}
361361

362362
- name: Cache turborepo for macOS
363-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
363+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
364364
with:
365365
path: ${{ env.TURBO_CACHE_DIR }}
366366
key: ${{ runner.os }}-turborepo-macos-${{ hashFiles('yarn.lock') }}
@@ -374,7 +374,7 @@ jobs:
374374
runs-on: macos-latest
375375
steps:
376376
- name: Checkout
377-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
377+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
378378
with:
379379
submodules: recursive
380380

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v5.0.0
13+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98 # v5.0.0
1414
with:
1515
submodules: recursive
1616

‎.github/workflows/test-skia-package.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
steps:
4848
- name: Checkout repository
49-
uses: actions/[email protected].1
49+
uses: actions/[email protected].2
5050

5151
- name: Setup Node.js
5252
uses: actions/setup-node@v6
@@ -203,7 +203,7 @@ jobs:
203203

204204
steps:
205205
- name: Checkout repository
206-
uses: actions/[email protected].1
206+
uses: actions/[email protected].2
207207

208208
- name: Setup Node.js
209209
uses: actions/setup-node@v6
@@ -372,7 +372,7 @@ jobs:
372372

373373
steps:
374374
- name: Checkout repository
375-
uses: actions/[email protected].1
375+
uses: actions/[email protected].2
376376

377377
- name: Setup Node.js
378378
uses: actions/setup-node@v6

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22.12.0
1+
v22.22.0

‎apps/docs/docs/getting-started/web.mdx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ export default function App() {
139139
<WithSkiaWeb
140140
opts={{ locateFile: (file) => `https://cdn.jsdelivr.net/npm/canvaskit-wasm@${version}/bin/full/${file}` }}
141141
getComponent={() => import("./MySkiaComponent")}
142+
/>
142143
);
143144
}
144145
```

0 commit comments

Comments
 (0)