Skip to content

Commit cd52b9f

Browse files
misei-nulmisei-nul
authored
Merge pull request #13 from Incomplete-Outputs-Lab/feature/auto-updater
feat: Implement Tauri auto-updater with version display
2 parents b170b17 + 19551af commit cd52b9f

File tree

16 files changed

+1169
-2286
lines changed

16 files changed

+1169
-2286
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818

19-
- name: Setup Node.js
20-
uses: actions/setup-node@v4
19+
- name: Setup Bun
20+
uses: oven-sh/setup-bun@v2
2121
with:
22-
node-version: lts/*
23-
cache: 'npm'
22+
bun-version: latest
2423

2524
- name: Install Rust toolchain
2625
uses: dtolnay/rust-toolchain@stable
@@ -53,7 +52,7 @@ jobs:
5352
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:${PKG_CONFIG_PATH}" >> $GITHUB_ENV
5453
5554
- name: Install frontend dependencies
56-
run: npm ci
55+
run: bun install --frozen-lockfile
5756

5857
- name: Check Rust formatting
5958
working-directory: src-tauri
@@ -72,4 +71,4 @@ jobs:
7271
run: cargo test --all-features
7372

7473
- name: Build frontend
75-
run: npm run build
74+
run: bun run build

‎.github/workflows/pre-release.yml‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
name: 'Publish Pre-Release'
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*-beta*'
7+
- 'v*-alpha*'
8+
- 'v*-rc*'
9+
10+
jobs:
11+
publish-tauri-prerelease:
12+
permissions:
13+
contents: write
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
include:
18+
- platform: 'macos-latest'
19+
args: '--target aarch64-apple-darwin'
20+
- platform: 'macos-latest'
21+
args: '--target x86_64-apple-darwin'
22+
- platform: 'ubuntu-latest'
23+
args: ''
24+
- platform: 'windows-latest'
25+
args: '--target x86_64-pc-windows-msvc'
26+
27+
runs-on: ${{ matrix.platform }}
28+
steps:
29+
- name: Checkout repository
30+
uses: actions/checkout@v4
31+
32+
- name: Install dependencies (ubuntu only)
33+
if: matrix.platform == 'ubuntu-latest'
34+
run: |
35+
sudo apt-get update
36+
sudo apt-get install -y \
37+
build-essential \
38+
curl \
39+
wget \
40+
file \
41+
pkg-config \
42+
libglib2.0-dev \
43+
libwebkit2gtk-4.1-dev \
44+
libssl-dev \
45+
libayatana-appindicator3-dev \
46+
librsvg2-dev \
47+
patchelf
48+
49+
- name: Set PKG_CONFIG_PATH for Linux
50+
if: matrix.platform == 'ubuntu-latest'
51+
run: |
52+
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:${PKG_CONFIG_PATH}" >> $GITHUB_ENV
53+
54+
- name: Setup Rust
55+
uses: dtolnay/rust-toolchain@stable
56+
with:
57+
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
58+
59+
- name: Cache Rust build
60+
uses: swatinem/rust-cache@v2
61+
with:
62+
workspaces: './src-tauri -> target'
63+
64+
- name: Setup Bun
65+
uses: oven-sh/setup-bun@v2
66+
with:
67+
bun-version: latest
68+
69+
- name: Install frontend dependencies
70+
run: bun install --frozen-lockfile
71+
72+
- name: Set build environment variables
73+
shell: bash
74+
run: |
75+
echo "GIT_COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
76+
echo "GIT_BRANCH=${GITHUB_REF_NAME}" >> $GITHUB_ENV
77+
echo "BUILD_TIMESTAMP=$(date -u +"%Y-%m-%d %H:%M:%S UTC")" >> $GITHUB_ENV
78+
79+
- name: Determine pre-release type
80+
shell: bash
81+
run: |
82+
TAG_NAME=${GITHUB_REF_NAME}
83+
if [[ $TAG_NAME == *"alpha"* ]]; then
84+
echo "PRERELEASE_TYPE=Alpha" >> $GITHUB_ENV
85+
echo "PRERELEASE_EMOJI=🚧" >> $GITHUB_ENV
86+
echo "TAG_PREFIX=alpha" >> $GITHUB_ENV
87+
elif [[ $TAG_NAME == *"beta"* ]]; then
88+
echo "PRERELEASE_TYPE=Beta" >> $GITHUB_ENV
89+
echo "PRERELEASE_EMOJI=🧪" >> $GITHUB_ENV
90+
echo "TAG_PREFIX=beta" >> $GITHUB_ENV
91+
elif [[ $TAG_NAME == *"rc"* ]]; then
92+
echo "PRERELEASE_TYPE=Release Candidate" >> $GITHUB_ENV
93+
echo "PRERELEASE_EMOJI=🎯" >> $GITHUB_ENV
94+
echo "TAG_PREFIX=rc" >> $GITHUB_ENV
95+
else
96+
echo "PRERELEASE_TYPE=Pre-Release" >> $GITHUB_ENV
97+
echo "PRERELEASE_EMOJI=⚠️" >> $GITHUB_ENV
98+
echo "TAG_PREFIX=pre" >> $GITHUB_ENV
99+
fi
100+
101+
# Extract version number from tag (e.g., v1.0.0-alpha.1 -> 1.0.0 and 1)
102+
BASE_VERSION=$(echo $TAG_NAME | sed -E 's/v([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/')
103+
PRERELEASE_NUMBER=$(echo $TAG_NAME | sed -E 's/.*\.(.*)/\1/')
104+
echo "BASE_VERSION=$BASE_VERSION" >> $GITHUB_ENV
105+
echo "PRERELEASE_NUMBER=$PRERELEASE_NUMBER" >> $GITHUB_ENV
106+
107+
- name: Build Tauri App
108+
uses: tauri-apps/tauri-action@v0
109+
env:
110+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
112+
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
113+
GIT_COMMIT_HASH: ${{ env.GIT_COMMIT_HASH }}
114+
GIT_BRANCH: ${{ env.GIT_BRANCH }}
115+
BUILD_TIMESTAMP: ${{ env.BUILD_TIMESTAMP }}
116+
with:
117+
tagName: ${{ github.ref_name }}
118+
releaseName: '${{ env.PRERELEASE_EMOJI }} OBS Sync ${{ github.ref_name }}'
119+
releaseBody: |
120+
## ${{ env.PRERELEASE_EMOJI }} Pre-Release: ${{ env.PRERELEASE_TYPE }}
121+
122+
**⚠️ This is a pre-release version intended for testing purposes.**
123+
124+
### What's New in This Pre-Release
125+
- Auto-generated pre-release from GitHub Actions
126+
- Built from commit: ${{ env.GIT_COMMIT_HASH }}
127+
- Branch: ${{ env.GIT_BRANCH }}
128+
- Build time: ${{ env.BUILD_TIMESTAMP }}
129+
130+
### Important Notes
131+
- ⚠️ **Use at your own risk**: This version may contain bugs or unstable features
132+
- 🧪 **For testing only**: Not recommended for production use
133+
- 📝 **Feedback welcome**: Please report issues on GitHub
134+
- 🔄 **Auto-update**: This version supports automatic updates to newer pre-releases and stable releases
135+
136+
### Download Instructions
137+
Select the appropriate installer for your platform:
138+
- **Windows**: `.msi` file
139+
- **macOS**: `.dmg` file
140+
- **Linux**: `.AppImage` or `.deb` file
141+
142+
### How to Help
143+
1. Download and test this pre-release
144+
2. Report any issues you encounter
145+
3. Provide feedback on new features
146+
4. Help us make the stable release better!
147+
148+
---
149+
📋 **Full changelog and stable releases**: [View all releases](https://github.com/${{ github.repository }}/releases)
150+
releaseDraft: false
151+
prerelease: true
152+
includeUpdaterJson: true
153+
args: ${{ matrix.args }}

‎.github/workflows/release.yml‎

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,43 @@
1-
name: Release
1+
name: 'Publish Release'
22

33
on:
44
push:
55
tags:
6-
- 'v*.*.*'
7-
8-
permissions:
9-
contents: write
6+
- 'v*'
107

118
jobs:
12-
release:
13-
if: startsWith(github.ref, 'refs/tags/v')
9+
publish-tauri:
10+
permissions:
11+
contents: write
12+
# Skip this job if the tag contains pre-release indicators
13+
if: ${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref_name, 'alpha') && !contains(github.ref_name, 'beta') && !contains(github.ref_name, 'rc') }}
1414
strategy:
1515
fail-fast: false
1616
matrix:
1717
include:
18+
- platform: 'macos-latest'
19+
args: '--target aarch64-apple-darwin'
20+
- platform: 'macos-latest'
21+
args: '--target x86_64-apple-darwin'
1822
- platform: 'ubuntu-latest'
1923
args: ''
2024
- platform: 'windows-latest'
21-
args: ''
22-
- platform: 'macos-latest'
23-
args: ''
25+
args: '--target x86_64-pc-windows-msvc'
2426

2527
runs-on: ${{ matrix.platform }}
2628

2729
steps:
2830
- uses: actions/checkout@v4
2931

30-
- name: Setup Node.js
31-
uses: actions/setup-node@v4
32+
- name: Setup Bun
33+
uses: oven-sh/setup-bun@v2
3234
with:
33-
node-version: lts/*
34-
cache: 'npm'
35+
bun-version: latest
3536

36-
- name: Install Rust toolchain
37+
- name: Setup Rust
3738
uses: dtolnay/rust-toolchain@stable
39+
with:
40+
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
3841

3942
- name: Cache Rust build
4043
uses: swatinem/rust-cache@v2
@@ -68,19 +71,44 @@ jobs:
6871
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:${PKG_CONFIG_PATH}" >> $GITHUB_ENV
6972
7073
- name: Install frontend dependencies
71-
run: npm ci
74+
run: bun install --frozen-lockfile
7275

73-
- name: Build frontend
74-
run: npm run build
76+
- name: Set build environment variables
77+
shell: bash
78+
run: |
79+
echo "GIT_COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
80+
echo "GIT_BRANCH=${GITHUB_REF_NAME}" >> $GITHUB_ENV
81+
echo "BUILD_TIMESTAMP=$(date -u +"%Y-%m-%d %H:%M:%S UTC")" >> $GITHUB_ENV
7582
76-
- name: Publish Tauri builds
83+
- name: Build Tauri App
7784
uses: tauri-apps/tauri-action@v0
7885
env:
7986
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87+
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
88+
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
89+
GIT_COMMIT_HASH: ${{ env.GIT_COMMIT_HASH }}
90+
GIT_BRANCH: ${{ env.GIT_BRANCH }}
91+
BUILD_TIMESTAMP: ${{ env.BUILD_TIMESTAMP }}
8092
with:
81-
tagName: ${{ github.ref_name }}
82-
releaseName: 'OBS Sync ${{ github.ref_name }}'
83-
releaseBody: '🚀 Release version ${{ github.ref_name }}'
93+
tagName: v__VERSION__
94+
releaseName: 'OBS Sync v__VERSION__'
95+
releaseBody: |
96+
## What's Changed
97+
- Auto-generated release from GitHub Actions
98+
- Built from commit: ${{ env.GIT_COMMIT_HASH }}
99+
- Branch: ${{ env.GIT_BRANCH }}
100+
- Build time: ${{ env.BUILD_TIMESTAMP }}
101+
102+
## Download
103+
Select the appropriate installer for your platform:
104+
- **Windows**: `.msi` file
105+
- **macOS**: `.dmg` file
106+
- **Linux**: `.AppImage` or `.deb` file
107+
108+
## Auto-Update
109+
This release supports automatic updates. The app will check for updates on startup and you can manually check via the system tray menu.
110+
111+
See the assets below to download and install this version.
84112
releaseDraft: false
85-
prerelease: false
113+
includeUpdaterJson: true
86114
args: ${{ matrix.args }}

‎.github/workflows/test-build.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: 'Test Build'
2+
3+
on:
4+
push:
5+
branches: [main, master, development, feature/*]
6+
pull_request:
7+
branches: [main, master, development]
8+
9+
jobs:
10+
test-tauri:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
include:
15+
- platform: 'macos-latest'
16+
args: '--target aarch64-apple-darwin'
17+
- platform: 'ubuntu-latest'
18+
args: ''
19+
- platform: 'windows-latest'
20+
args: ''
21+
22+
runs-on: ${{ matrix.platform }}
23+
steps:
24+
- name: Checkout repository
25+
uses: actions/checkout@v4
26+
27+
- name: Install dependencies (ubuntu only)
28+
if: matrix.platform == 'ubuntu-latest'
29+
run: |
30+
sudo apt-get update
31+
sudo apt-get install -y \
32+
build-essential \
33+
curl \
34+
wget \
35+
file \
36+
pkg-config \
37+
libglib2.0-dev \
38+
libwebkit2gtk-4.1-dev \
39+
libssl-dev \
40+
libayatana-appindicator3-dev \
41+
librsvg2-dev \
42+
patchelf
43+
44+
- name: Set PKG_CONFIG_PATH for Linux
45+
if: matrix.platform == 'ubuntu-latest'
46+
run: |
47+
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:${PKG_CONFIG_PATH}" >> $GITHUB_ENV
48+
49+
- name: Setup Rust
50+
uses: dtolnay/rust-toolchain@stable
51+
with:
52+
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
53+
54+
- name: Cache Rust build
55+
uses: swatinem/rust-cache@v2
56+
with:
57+
workspaces: './src-tauri -> target'
58+
59+
- name: Setup Bun
60+
uses: oven-sh/setup-bun@v2
61+
with:
62+
bun-version: latest
63+
64+
- name: Install frontend dependencies
65+
run: bun install --frozen-lockfile
66+
67+
- name: Set build environment variables
68+
shell: bash
69+
run: |
70+
echo "GIT_COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
71+
echo "GIT_BRANCH=${GITHUB_REF_NAME}" >> $GITHUB_ENV
72+
echo "BUILD_TIMESTAMP=$(date -u +"%Y-%m-%d %H:%M:%S UTC")" >> $GITHUB_ENV
73+
74+
- name: Test Build Tauri App
75+
uses: tauri-apps/tauri-action@v0
76+
env:
77+
GIT_COMMIT_HASH: ${{ env.GIT_COMMIT_HASH }}
78+
GIT_BRANCH: ${{ env.GIT_BRANCH }}
79+
BUILD_TIMESTAMP: ${{ env.BUILD_TIMESTAMP }}
80+
with:
81+
args: ${{ matrix.args }}
82+
# Don't create releases for test builds
83+
includeRelease: false

0 commit comments

Comments
 (0)