Skip to content

Commit 1848a43

Browse files
committed
build?
1 parent 9c1682a commit 1848a43

File tree

1 file changed

+16
-26
lines changed

1 file changed

+16
-26
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ jobs:
1818
name: Headers
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: Log in to GitHub Container Registry
22-
uses: docker/login-action@v3
23-
with:
24-
registry: ghcr.io
25-
username: ${{ github.actor }}
26-
password: ${{ secrets.GITHUB_TOKEN }}
27-
2821
- name: Checkout
2922
uses: actions/checkout@v4
3023
with:
@@ -49,13 +42,8 @@ jobs:
4942
path: artifacts/headers
5043

5144
windows:
52-
name: Windows (${{ matrix.arch }})
45+
name: Windows
5346
runs-on: windows-latest
54-
strategy:
55-
matrix:
56-
arch:
57-
- x64
58-
#- arm64
5947
env:
6048
DEPOT_TOOLS_WIN_TOOLCHAIN: "0"
6149
steps:
@@ -79,13 +67,13 @@ jobs:
7967
- name: Build ${{ matrix.arch }}
8068
shell: pwsh
8169
run: |
82-
../depot_tools/python-bin/python3.bat scripts/build.py windows ${{ matrix.arch }}
70+
depot_tools/python-bin/python3.bat scripts/build.py windows all
8371
8472
- name: Upload artifact
8573
uses: actions/upload-artifact@v4
8674
with:
87-
name: windows-${{ matrix.arch }}
88-
path: artifacts/windows_${{ matrix.arch }}
75+
name: windows-all
76+
path: artifacts/*
8977

9078
linux-all:
9179
name: Linux (all)
@@ -96,6 +84,13 @@ jobs:
9684
username: ${{ github.actor }}
9785
password: ${{ secrets.GITHUB_TOKEN }}
9886
steps:
87+
- name: Log in to GitHub Container Registry
88+
uses: docker/login-action@v3
89+
with:
90+
registry: ghcr.io
91+
username: ${{ github.actor }}
92+
password: ${{ secrets.GITHUB_TOKEN }}
93+
9994
- name: Checkout
10095
uses: actions/checkout@v4
10196
with:
@@ -124,13 +119,8 @@ jobs:
124119
path: artifacts/linux_*
125120

126121
macos:
127-
name: macOS (${{ matrix.arch }})
122+
name: macOS
128123
runs-on: macos-latest
129-
strategy:
130-
matrix:
131-
arch:
132-
- x64
133-
# - arm64 # disabled for now
134124

135125
steps:
136126
- name: Checkout
@@ -149,11 +139,11 @@ jobs:
149139
cd ../skia
150140
python3 tools/git-sync-deps
151141
152-
- name: Build ${{ matrix.arch }}
153-
run: python3 scripts/build.py macos ${{ matrix.arch }}
142+
- name: Build
143+
run: python3 scripts/build.py macos all
154144

155145
- name: Upload artifact
156146
uses: actions/upload-artifact@v4
157147
with:
158-
name: macos-${{ matrix.arch }}
159-
path: artifacts/macos_${{ matrix.arch }}
148+
name: macos-all
149+
path: artifacts/*

0 commit comments

Comments
 (0)