Skip to content

Commit 6481db3

Browse files
authored
ci: fix macOS intel build (#41)
1 parent 781d097 commit 6481db3

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

.github/workflows/build.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
rust-target: aarch64-apple-darwin
3333
artifact-name: gui-macos-arm64
3434
gui-exe-name: perpetua
35-
# - os: macos-15-intel
36-
# platform: macOS-x86_64
37-
# rust-target: x86_64-apple-darwin
38-
# artifact-name: gui-macos-x86_64
39-
# gui-exe-name: perpetua
35+
- os: macos-15-intel
36+
platform: macOS-x86_64
37+
rust-target: x86_64-apple-darwin
38+
artifact-name: gui-macos-x86_64
39+
gui-exe-name: perpetua
4040
- os: windows-latest
4141
platform: Windows-x86_64
4242
rust-target: x86_64-pc-windows-msvc
@@ -99,20 +99,20 @@ jobs:
9999
fail-fast: false
100100
matrix:
101101
include:
102-
- os: macos-latest
102+
- os: macos-26
103103
platform: macOS-arm64
104104
rust-target: aarch64-apple-darwin
105105
artifact-name: gui-macos-arm64
106106
gui-exe-name: perpetua
107107
build-output: .build/aarch64-apple-darwin/release
108108
archive-name: Perpetua-macOS
109-
# - os: macos-15-intel
110-
# platform: macOS-x86_64
111-
# rust-target: x86_64-apple-darwin
112-
# artifact-name: gui-macos-x86_64
113-
# gui-exe-name: perpetua
114-
# build-output: .build/x86_64-apple-darwin/release
115-
# archive-name: Perpetua-macOS-Intel
109+
- os: macos-15-intel
110+
platform: macOS-x86_64
111+
rust-target: x86_64-apple-darwin
112+
artifact-name: gui-macos-x86_64
113+
gui-exe-name: perpetua
114+
build-output: .build/x86_64-apple-darwin/release
115+
archive-name: Perpetua-macOS-Intel
116116
- os: windows-latest
117117
platform: Windows-x86_64
118118
rust-target: x86_64-pc-windows-msvc
@@ -158,13 +158,16 @@ jobs:
158158
env:
159159
MAC_CERTIFICATE: ${{ secrets.CERTIFICATE }}
160160
MAC_CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
161+
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
161162
run: |
162163
echo "$MAC_CERTIFICATE" | base64 --decode > certificate.p12
163-
security create-keychain -p "action" build.keychain
164+
security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
165+
security default-keychain -s build.keychain
166+
security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
167+
security set-keychain-settings -t 3600 -u build.keychain
164168
security import certificate.p12 -k build.keychain -P "$MAC_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
165-
security list-keychains -s build.keychain
166-
security unlock-keychain -p "action" build.keychain
167-
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "action" build.keychain
169+
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
170+
security find-identity -v -p codesigning build.keychain
168171
rm certificate.p12
169172
170173
- name: Build daemon

0 commit comments

Comments
 (0)