Skip to content

Commit 0bd7a66

Browse files
committed
reorganise build workflow
1 parent 2b6823a commit 0bd7a66

File tree

1 file changed

+34
-41
lines changed

1 file changed

+34
-41
lines changed

.github/workflows/build.yml

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,6 @@ jobs:
2929
id: darwin_amd64_gui
3030
cmd: make darwin_amd64_gui
3131
out: out/darwin_amd64_gui/yarr.app
32-
- name: Build arm64
33-
uses: ./.github/actions/prepare
34-
with:
35-
id: darwin_arm64
36-
cmd: make darwin_arm64
37-
out: out/darwin_arm64/yarr
38-
- name: Build amd64
39-
uses: ./.github/actions/prepare
40-
with:
41-
id: darwin_amd64
42-
cmd: make darwin_amd64
43-
out: out/darwin_amd64/yarr
4432

4533
build_windows:
4634
name: Build for Windows
@@ -52,40 +40,21 @@ jobs:
5240
uses: actions/setup-go@v4
5341
with:
5442
go-version: '^1.18'
55-
- name: Setup Zig
56-
uses: mlugg/setup-zig@v1
57-
with:
58-
version: 0.14.0
59-
- name: Build arm64 gui
60-
if: false
61-
uses: ./.github/actions/prepare
62-
with:
63-
id: windows_arm64_gui
64-
cmd: make windows_arm64_gui
65-
out: out/windows_arm64_gui/yarr.exe
6643
- name: Build amd64 gui
6744
uses: ./.github/actions/prepare
6845
with:
6946
id: windows_amd64_gui
7047
cmd: make windows_amd64_gui
7148
out: out/windows_amd64_gui/yarr.exe
72-
- name: Remove cache
73-
run: go clean -x -cache
74-
- name: Build arm64
75-
uses: ./.github/actions/prepare
76-
with:
77-
id: windows_arm64
78-
cmd: make windows_arm64
79-
out: out/windows_arm64/yarr
80-
- name: Build amd64
49+
- name: Build arm64 gui
8150
uses: ./.github/actions/prepare
8251
with:
83-
id: windows_amd64
84-
cmd: make windows_amd64
85-
out: out/windows_amd64/yarr
52+
id: windows_arm64_gui
53+
cmd: make windows_arm64_gui
54+
out: out/windows_arm64_gui/yarr.exe
8655

87-
build_linux:
88-
name: Build for Linux
56+
build_multi_cli:
57+
name: Build for Windows/MacOS/Linux CLI
8958
runs-on: ubuntu-22.04
9059
steps:
9160
- name: Checkout
@@ -98,30 +67,54 @@ jobs:
9867
uses: mlugg/setup-zig@v1
9968
with:
10069
version: 0.14.0
101-
- name: Build amd64
70+
- name: Build linux/amd64
10271
uses: ./.github/actions/prepare
10372
with:
10473
id: linux_amd64
10574
cmd: make linux_amd64
10675
out: out/linux_amd64/yarr
107-
- name: Build arm64
76+
- name: Build linux/arm64
10877
uses: ./.github/actions/prepare
10978
with:
11079
id: linux_arm64
11180
cmd: make linux_arm64
11281
out: out/linux_arm64/yarr
113-
- name: Build armv7
82+
- name: Build linux/armv7
11483
uses: ./.github/actions/prepare
11584
with:
11685
id: linux_armv7
11786
cmd: make linux_armv7
11887
out: out/linux_armv7/yarr
88+
- name: Build darwin/arm64
89+
uses: ./.github/actions/prepare
90+
with:
91+
id: darwin_arm64
92+
cmd: make darwin_arm64
93+
out: out/darwin_arm64/yarr
94+
- name: Build darwin/amd64
95+
uses: ./.github/actions/prepare
96+
with:
97+
id: darwin_amd64
98+
cmd: make darwin_amd64
99+
out: out/darwin_amd64/yarr
100+
- name: Build windows/amd64
101+
uses: ./.github/actions/prepare
102+
with:
103+
id: windows_amd64
104+
cmd: make windows_amd64
105+
out: out/windows_amd64/yarr
106+
- name: Build windows/arm64
107+
uses: ./.github/actions/prepare
108+
with:
109+
id: windows_arm64
110+
cmd: make windows_arm64
111+
out: out/windows_arm64/yarr
119112

120113
create_release:
121114
name: Create Release
122115
runs-on: ubuntu-latest
123116
if: ${{ startsWith(github.ref, 'refs/tags/') }}
124-
needs: [build_macos, build_windows, build_linux]
117+
needs: [build_macos, build_windows, build_multi_cli]
125118
steps:
126119
- name: Download Artifacts
127120
uses: actions/[email protected]

0 commit comments

Comments
 (0)