Skip to content

Commit 2f42da7

Browse files
committed
fixes
1 parent 3a0531b commit 2f42da7

File tree

3 files changed

+14
-45
lines changed

3 files changed

+14
-45
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
tags:
66
- 'v*'
77

8+
permissions:
9+
contents: write
10+
811
jobs:
912
build-macos:
1013
runs-on: macos-latest
@@ -13,47 +16,21 @@ jobs:
1316

1417
- name: Setup Rust
1518
uses: dtolnay/rust-toolchain@stable
16-
with:
17-
targets: x86_64-apple-darwin,aarch64-apple-darwin
18-
19-
- name: Install dependencies
20-
run: |
21-
brew install openssl@3
22-
23-
- name: Build ARM64
24-
env:
25-
OPENSSL_DIR: /opt/homebrew/opt/openssl@3
26-
run: |
27-
cd src-tauri
28-
cargo build --release --target aarch64-apple-darwin
2919

30-
- name: Build x86_64
31-
env:
32-
OPENSSL_DIR: /usr/local/opt/openssl@3
20+
- name: Build (native ARM64 only)
3321
run: |
3422
cd src-tauri
35-
cargo build --release --target x86_64-apple-darwin
23+
cargo build --release
3624
37-
- name: Package ARM64
25+
- name: Package
3826
run: |
39-
cd src-tauri/target/aarch64-apple-darwin/release
27+
cd src-tauri/target/release
4028
tar -czf berri-recall-macos-arm64.tar.gz berri-recall
41-
mv berri-recall-macos-arm64.tar.gz ../../../
4229
43-
- name: Package x86_64
44-
run: |
45-
cd src-tauri/target/x86_64-apple-darwin/release
46-
tar -czf berri-recall-macos-amd64.tar.gz berri-recall
47-
mv berri-recall-macos-amd64.tar.gz ../../../
48-
49-
- name: Upload Release Assets
30+
- name: Upload Release Asset
5031
uses: softprops/action-gh-release@v2
5132
with:
52-
files: |
53-
src-tauri/berri-recall-macos-arm64.tar.gz
54-
src-tauri/berri-recall-macos-amd64.tar.gz
55-
env:
56-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
files: src-tauri/target/release/berri-recall-macos-arm64.tar.gz
5734

5835
build-linux:
5936
runs-on: ubuntu-latest
@@ -77,14 +54,11 @@ jobs:
7754
run: |
7855
cd src-tauri/target/release
7956
tar -czf berri-recall-linux-amd64.tar.gz berri-recall
80-
mv berri-recall-linux-amd64.tar.gz ../
8157
8258
- name: Upload Release Asset
8359
uses: softprops/action-gh-release@v2
8460
with:
85-
files: src-tauri/target/berri-recall-linux-amd64.tar.gz
86-
env:
87-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
files: src-tauri/target/release/berri-recall-linux-amd64.tar.gz
8862

8963
build-windows:
9064
runs-on: windows-latest
@@ -103,11 +77,8 @@ jobs:
10377
run: |
10478
cd src-tauri/target/release
10579
Compress-Archive -Path berri-recall.exe -DestinationPath berri-recall-windows-amd64.zip
106-
Move-Item berri-recall-windows-amd64.zip ../
10780
10881
- name: Upload Release Asset
10982
uses: softprops/action-gh-release@v2
11083
with:
111-
files: src-tauri/target/berri-recall-windows-amd64.zip
112-
env:
113-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
84+
files: src-tauri/target/release/berri-recall-windows-amd64.zip

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ berri-recall setup
4444
### From GitHub releases
4545

4646
Grab the latest binary for your platform:
47-
- [macOS (Apple Silicon)](https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-macos-arm64.tar.gz)
48-
- [macOS (Intel)](https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-macos-amd64.tar.gz)
47+
- [macOS (ARM & Intel via Rosetta)](https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-macos-arm64.tar.gz)
4948
- [Linux](https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-linux-amd64.tar.gz)
5049
- [Windows](https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-windows-amd64.zip)
5150

install.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ echo "Detected: $OS $ARCH"
2626

2727
case "$OS" in
2828
Darwin)
29+
BINARY_URL="https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-macos-arm64.tar.gz"
2930
if [ "$ARCH" = "arm64" ]; then
30-
BINARY_URL="https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-macos-arm64.tar.gz"
3131
PLATFORM="macOS (Apple Silicon)"
3232
else
33-
BINARY_URL="https://github.com/monishobaid/berri-recall/releases/latest/download/berri-recall-macos-amd64.tar.gz"
34-
PLATFORM="macOS (Intel)"
33+
PLATFORM="macOS (Intel - running ARM binary via Rosetta)"
3534
fi
3635
;;
3736
Linux)

0 commit comments

Comments
 (0)