Skip to content

Commit ab52a20

Browse files
ci: fix macos openssl build, enable updater artifact generation
1 parent 538d1ee commit ab52a20

3 files changed

Lines changed: 46 additions & 1 deletion

File tree

.github/workflows/release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ jobs:
9090

9191
- uses: swatinem/rust-cache@v2
9292

93+
# openssl-sys uses pkg-config which doesn't support cross-compilation.
94+
# Vendored mode compiles OpenSSL from source using Clang, which handles
95+
# both architectures natively on macOS.
96+
- name: Use vendored OpenSSL for macOS cross-compilation
97+
if: matrix.platform == 'macos-latest'
98+
run: echo "OPENSSL_VENDORED=1" >> $GITHUB_ENV
99+
93100
# ── Frontend deps ─────────────────────────────────────────────────────────
94101
- name: Install frontend dependencies
95102
working-directory: crates/git-sync-desktop

crates/git-sync-desktop/src-tauri/tauri.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"icons/128x128@2x.png",
2424
"icons/icon.icns",
2525
"icons/icon.ico"
26-
]
26+
],
27+
"createUpdaterArtifacts": true
2728
},
2829
"plugins": {
2930
"updater": {

flake.nix

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
description = "git-sync desktop development environment";
3+
4+
inputs = {
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
6+
rust-overlay = {
7+
url = "github:oxalica/rust-overlay";
8+
inputs.nixpkgs.follows = "nixpkgs";
9+
};
10+
flake-utils.url = "github:numtide/flake-utils";
11+
};
12+
13+
outputs = {
14+
nixpkgs,
15+
rust-overlay,
16+
flake-utils,
17+
...
18+
}:
19+
flake-utils.lib.eachDefaultSystem (system: let
20+
pkgs = import nixpkgs {
21+
inherit system;
22+
overlays = [rust-overlay.overlays.default];
23+
};
24+
rustToolchain = pkgs.rust-bin.stable.latest.default.override {
25+
extensions = ["rustfmt" "rust-src"];
26+
};
27+
in {
28+
devShells.default = pkgs.mkShell {
29+
packages = with pkgs; [
30+
rustToolchain
31+
nodejs
32+
pnpm
33+
just
34+
];
35+
};
36+
});
37+
}

0 commit comments

Comments
 (0)