Skip to content

Commit 4d06877

Browse files
authored
Merge pull request #2102 from Shopify/revert-to-m119
Revert to m119
2 parents cc43a95 + 11c223c commit 4d06877

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.github/workflows/build-skia.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
run: yarn build-skia
4545

4646
- name: Upload artifacts - Android arm
47+
if: github.ref == 'refs/heads/main'
4748
uses: actions/upload-artifact@v2
4849
with:
4950
name: skia-android-arm
@@ -57,6 +58,7 @@ jobs:
5758
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskunicode.a
5859
5960
- name: Upload artifacts - Android arm64
61+
if: github.ref == 'refs/heads/main'
6062
uses: actions/upload-artifact@v2
6163
with:
6264
name: skia-android-arm-64
@@ -70,6 +72,7 @@ jobs:
7072
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskunicode.a
7173
7274
- name: Upload artifacts - Android x86
75+
if: github.ref == 'refs/heads/main'
7376
uses: actions/upload-artifact@v2
7477
with:
7578
name: skia-android-arm-x86
@@ -83,6 +86,7 @@ jobs:
8386
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskunicode.a
8487
8588
- name: Upload artifacts - Android x64
89+
if: github.ref == 'refs/heads/main'
8690
uses: actions/upload-artifact@v2
8791
with:
8892
name: skia-android-arm-x64
@@ -96,6 +100,7 @@ jobs:
96100
${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskunicode.a
97101
98102
- name: Upload artifacts - iOS xcframeworks
103+
if: github.ref == 'refs/heads/main'
99104
uses: actions/upload-artifact@v2
100105
with:
101106
name: skia-ios-xcframeworks

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "externals/skia"]
22
path = externals/skia
33
url = https://chromium.googlesource.com/skia/
4-
branch = chrome/m121
4+
branch = chrome/m119
55
[submodule "externals/depot_tools"]
66
path = externals/depot_tools
77
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git

externals/depot_tools

Submodule depot_tools updated from 007dd45 to 911ccd8

externals/skia

Submodule skia updated from e8d7db9 to 89907a0

0 commit comments

Comments
 (0)