Skip to content

Commit a6df93e

Browse files
committed
Fix macOS CI builds and rename binary to sprout
1 parent e27ba61 commit a6df93e

File tree

5 files changed

+31
-30
lines changed

5 files changed

+31
-30
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ jobs:
6363
args: ''
6464
- platform: ubuntu-22.04
6565
args: ''
66-
- platform: macos-latest
66+
- platform: macos-14
6767
args: '--target aarch64-apple-darwin'
68-
- platform: macos-latest
68+
- platform: macos-13
6969
args: '--target x86_64-apple-darwin'
7070

7171
runs-on: ${{ matrix.platform }}
@@ -92,7 +92,7 @@ jobs:
9292
- name: Install Rust stable
9393
uses: dtolnay/rust-toolchain@stable
9494
with:
95-
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
95+
targets: ${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || matrix.args == '--target x86_64-apple-darwin' && 'x86_64-apple-darwin' || '' }}
9696

9797
- name: Rust cache
9898
uses: swatinem/rust-cache@v2
@@ -112,12 +112,13 @@ jobs:
112112
- name: Upload artifacts
113113
uses: actions/upload-artifact@v4
114114
with:
115-
name: sprout-${{ matrix.platform }}${{ matrix.args && '-' || '' }}${{ matrix.args && 'intel' || '' }}
115+
name: sprout-${{ matrix.platform }}${{ matrix.args && '-' || '' }}${{ matrix.args == '--target aarch64-apple-darwin' && 'arm64' || matrix.args == '--target x86_64-apple-darwin' && 'intel' || '' }}
116116
path: |
117117
src-tauri/target/release/bundle/**/*.msi
118118
src-tauri/target/release/bundle/**/*.exe
119119
src-tauri/target/release/bundle/**/*.AppImage
120120
src-tauri/target/release/bundle/**/*.deb
121121
src-tauri/target/release/bundle/**/*.dmg
122122
src-tauri/target/*/release/bundle/**/*.dmg
123+
src-tauri/target/*/release/bundle/**/*.app
123124
if-no-files-found: ignore

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
args: ''
1818
- platform: ubuntu-22.04
1919
args: ''
20-
- platform: macos-latest
20+
- platform: macos-14
2121
args: '--target aarch64-apple-darwin'
22-
- platform: macos-latest
22+
- platform: macos-13
2323
args: '--target x86_64-apple-darwin'
2424

2525
runs-on: ${{ matrix.platform }}
@@ -46,7 +46,7 @@ jobs:
4646
- name: Install Rust stable
4747
uses: dtolnay/rust-toolchain@stable
4848
with:
49-
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
49+
targets: ${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || matrix.args == '--target x86_64-apple-darwin' && 'x86_64-apple-darwin' || '' }}
5050

5151
- name: Rust cache
5252
uses: swatinem/rust-cache@v2

src-tauri/Cargo.lock

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "pumpkin-panel"
2+
name = "sprout"
33
version = "0.1.0"
44
edition = "2021"
55

@@ -21,5 +21,5 @@ reqwest = { version = "0.12", features = ["stream", "json"] }
2121
futures-util = "0.3"
2222

2323
[[bin]]
24-
name = "pumpkin-panel"
24+
name = "sprout"
2525
path = "src/main.rs"

src-tauri/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub struct SystemMonitor {
6363
fn get_config_path() -> PathBuf {
6464
let config_dir = dirs::config_dir()
6565
.unwrap_or_else(|| PathBuf::from("."))
66-
.join("pumpkin-panel");
66+
.join("sprout");
6767
fs::create_dir_all(&config_dir).ok();
6868
config_dir.join("servers.json")
6969
}
@@ -309,7 +309,7 @@ pub struct CloudflareDnsRecord {
309309
fn get_cloudflare_token_path() -> PathBuf {
310310
let config_dir = dirs::config_dir()
311311
.unwrap_or_else(|| PathBuf::from("."))
312-
.join("pumpkin-panel");
312+
.join("sprout");
313313
fs::create_dir_all(&config_dir).ok();
314314
config_dir.join("cloudflare_token.json")
315315
}

0 commit comments

Comments
 (0)