Skip to content

[pull] main from Shopify:main #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Dec 15, 2025
Merged

[pull] main from Shopify:main #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5213527
chore(deps): bump actions/upload-artifact from 5 to 6 (#3607)
dependabot[bot] Dec 15, 2025
8ed59ac
chore(deps): bump actions/cache from 4.3.0 to 5.0.1 (#3606)
dependabot[bot] Dec 15, 2025
cb611c8
chore(deps): bump actions/download-artifact from 6 to 7 (#3605)
dependabot[bot] Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-dawn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
${{ matrix.strip_tool }} ${{ matrix.output_dir }}/${{ matrix.library_path }}

- name: Upload build artifacts
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: build-android-${{ matrix.arch }}
path: ${{ matrix.output_dir }}/${{ matrix.library_path }}
Expand All @@ -138,7 +138,7 @@ jobs:

- name: Upload headers (from arm64-v8a build only)
if: matrix.arch == 'arm64-v8a'
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: dawn-headers
path: dawn-headers/
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Release
ninja -C ${{ matrix.output_dir }}
- name: Upload build artifacts
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: build-${{ matrix.platform }}-${{ matrix.arch }}
path: ${{ matrix.output_dir }}/${{ matrix.library_path }}
Expand All @@ -217,13 +217,13 @@ jobs:
uses: actions/checkout@v6.0.1

- name: Download all build artifacts
uses: actions/download-artifact@v6
uses: actions/download-artifact@v7
with:
pattern: build-*
path: artifacts

- name: Download headers
uses: actions/download-artifact@v6
uses: actions/download-artifact@v7
with:
name: dawn-headers
path: dawn-headers
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci-graphite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
df -h

- name: Cache turborepo for Android
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
echo "sdk.dir=$ANDROID_HOME" > $GITHUB_WORKSPACE/apps/example/android/local.properties

- name: Cache Gradle
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
with:
path: |
~/.gradle/wrapper
Expand All @@ -93,15 +93,15 @@ jobs:
yarn turbo run build:android --concurrency 1

- name: Cache apk
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
env:
cache-name: cache-apk
with:
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
key: apk-graphite-${{ github.sha }}

- name: Upload Android APK artifact
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: android-example-apk-graphite
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:

- name: Restore APK
id: cache-apk
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb
with:
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
key: apk-graphite-${{ github.sha }}
Expand Down Expand Up @@ -171,13 +171,13 @@ jobs:
# Run tests
cd packages/skia && CI=true yarn test -i e2e/Path --testPathIgnorePatterns Paragraphs

- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
if: failure()
with:
path: packages/skia/src/__tests__/snapshots/
name: tests-snapshots-screenshots

- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
if: failure()
with:
path: apps/docs/static/
Expand All @@ -200,7 +200,7 @@ jobs:
graphite: true

- name: Cache turborepo for iOS
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
run: yarn pack

- name: Upload package artifact
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: package-tgz
path: packages/skia/package.tgz
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
df -h

- name: Cache turborepo for Android
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
echo "sdk.dir=$ANDROID_HOME" > $GITHUB_WORKSPACE/apps/example/android/local.properties

- name: Cache Gradle
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
with:
path: |
~/.gradle/wrapper
Expand All @@ -208,15 +208,15 @@ jobs:
yarn turbo run build:android --concurrency 1

- name: Cache apk
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
env:
cache-name: cache-apk
with:
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
key: apk-${{ github.sha }}

- name: Upload Android APK artifact
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: android-example-apk
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:

- name: Restore APK
id: cache-apk
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb
with:
path: apps/example/android/app/build/outputs/apk/debug/app-debug.apk
key: apk-${{ github.sha }}
Expand Down Expand Up @@ -285,13 +285,13 @@ jobs:
# Run tests
cd packages/skia && CI=true yarn e2e --testPathIgnorePatterns Paragraphs

- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
if: failure()
with:
path: packages/skia/src/__tests__/snapshots/
name: tests-snapshots-screenshots

- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
if: failure()
with:
path: apps/docs/static/
Expand All @@ -313,7 +313,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Cache turborepo for iOS
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}
Expand Down Expand Up @@ -360,7 +360,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Cache turborepo for macOS
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-macos-${{ hashFiles('yarn.lock') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-skia-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:

- name: Upload screenshot
if: always()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: ios-simulator-screenshot-${{ github.run_id }}
path: /Users/runner/skia-test-screenshot-ios.png
Expand Down Expand Up @@ -347,7 +347,7 @@ jobs:

- name: Upload screenshot
if: always()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: android-emulator-screenshot-${{ github.run_id }}
path: /Users/runner/skia-test-screenshot-android.png
Expand Down Expand Up @@ -480,7 +480,7 @@ jobs:

- name: Upload screenshot
if: always()
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
with:
name: web-screenshot-${{ github.run_id }}
path: /Users/runner/skia-test-screenshot-web.png
Expand Down
Loading