mirror of
https://github.com/zhom/donutbrowser.git
synced 2026-08-02 01:08:41 +02:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e92b290b6 | ||
|
|
eb62e0abf9 | ||
|
|
0ed5adf2ba | ||
|
|
dd91aaeea0 | ||
|
|
6a3407796d |
@@ -131,6 +131,6 @@ jobs:
|
|||||||
tagName: ${{ github.ref_name }}
|
tagName: ${{ github.ref_name }}
|
||||||
releaseName: "Donut Browser ${{ github.ref_name }}"
|
releaseName: "Donut Browser ${{ github.ref_name }}"
|
||||||
releaseBody: "See the assets to download this version and install."
|
releaseBody: "See the assets to download this version and install."
|
||||||
releaseDraft: true
|
releaseDraft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
args: ${{ matrix.args }}
|
args: ${{ matrix.args }}
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ jobs:
|
|||||||
uses: tauri-apps/tauri-action@v0
|
uses: tauri-apps/tauri-action@v0
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
BUILD_TAG: "nightly-${{ steps.commit.outputs.hash }}"
|
||||||
GITHUB_REF_NAME: "nightly-${{ steps.commit.outputs.hash }}"
|
GITHUB_REF_NAME: "nightly-${{ steps.commit.outputs.hash }}"
|
||||||
GITHUB_SHA: ${{ github.sha }}
|
GITHUB_SHA: ${{ github.sha }}
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -27,6 +27,8 @@
|
|||||||
|
|
||||||
## Download
|
## Download
|
||||||
|
|
||||||
|
> As of right now, the app is not signed by Apple. You need to have Gatekeeper disabled to run it.
|
||||||
|
|
||||||
The app can be downloaded from the [releases page](https://github.com/zhom/donutbrowser/releases/latest).
|
The app can be downloaded from the [releases page](https://github.com/zhom/donutbrowser/releases/latest).
|
||||||
|
|
||||||
## Supported Platforms
|
## Supported Platforms
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "donutbrowser",
|
"name": "donutbrowser",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.0",
|
"version": "0.2.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev --turbopack",
|
"dev": "next dev --turbopack",
|
||||||
|
|||||||
Generated
+1
-1
@@ -973,7 +973,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "donutbrowser"
|
name = "donutbrowser"
|
||||||
version = "0.1.0"
|
version = "0.2.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "donutbrowser"
|
name = "donutbrowser"
|
||||||
version = "0.1.0"
|
version = "0.2.1"
|
||||||
description = "A Tauri App"
|
description = "Browser Orchestrator"
|
||||||
authors = ["zhom@github"]
|
authors = ["zhom@github"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1</string>
|
<string>1</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.1.0</string>
|
<string>0.2.1</string>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleIconFile</key>
|
||||||
|
|||||||
+5
-2
@@ -6,8 +6,11 @@ fn main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Inject build version based on environment variables set by CI
|
// Inject build version based on environment variables set by CI
|
||||||
if let Ok(tag_name) = std::env::var("GITHUB_REF_NAME") {
|
if let Ok(build_tag) = std::env::var("BUILD_TAG") {
|
||||||
// This is set by GitHub Actions to the tag name (e.g., "v1.0.0" or "nightly-abc123")
|
// Custom BUILD_TAG takes highest priority (used for nightly builds)
|
||||||
|
println!("cargo:rustc-env=BUILD_VERSION={build_tag}");
|
||||||
|
} else if let Ok(tag_name) = std::env::var("GITHUB_REF_NAME") {
|
||||||
|
// This is set by GitHub Actions to the tag name (e.g., "v1.0.0")
|
||||||
println!("cargo:rustc-env=BUILD_VERSION={tag_name}");
|
println!("cargo:rustc-env=BUILD_VERSION={tag_name}");
|
||||||
} else if std::env::var("STABLE_RELEASE").is_ok() {
|
} else if std::env::var("STABLE_RELEASE").is_ok() {
|
||||||
// Fallback for stable releases - use CARGO_PKG_VERSION with 'v' prefix
|
// Fallback for stable releases - use CARGO_PKG_VERSION with 'v' prefix
|
||||||
|
|||||||
@@ -47,8 +47,19 @@ impl AppAutoUpdater {
|
|||||||
/// Check if running a nightly build based on environment variable
|
/// Check if running a nightly build based on environment variable
|
||||||
pub fn is_nightly_build() -> bool {
|
pub fn is_nightly_build() -> bool {
|
||||||
// If STABLE_RELEASE env var is set at compile time, it's a stable build
|
// If STABLE_RELEASE env var is set at compile time, it's a stable build
|
||||||
// Otherwise, it's a nightly build
|
if option_env!("STABLE_RELEASE").is_some() {
|
||||||
option_env!("STABLE_RELEASE").is_none()
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also check if the current version starts with "nightly-"
|
||||||
|
let current_version = Self::get_current_version();
|
||||||
|
if current_version.starts_with("nightly-") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If STABLE_RELEASE is not set and version doesn't start with "nightly-",
|
||||||
|
// it's still considered a nightly build (dev builds, main branch builds, etc.)
|
||||||
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get current app version from build-time injection
|
/// Get current app version from build-time injection
|
||||||
@@ -594,6 +605,10 @@ mod tests {
|
|||||||
// This will depend on whether STABLE_RELEASE is set during test compilation
|
// This will depend on whether STABLE_RELEASE is set during test compilation
|
||||||
let is_nightly = AppAutoUpdater::is_nightly_build();
|
let is_nightly = AppAutoUpdater::is_nightly_build();
|
||||||
println!("Is nightly build: {is_nightly}");
|
println!("Is nightly build: {is_nightly}");
|
||||||
|
|
||||||
|
// The result should be true for test builds since STABLE_RELEASE is not set
|
||||||
|
// unless the test is run in a stable release environment
|
||||||
|
assert!(is_nightly || option_env!("STABLE_RELEASE").is_some());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "Donut Browser",
|
"productName": "Donut Browser",
|
||||||
"version": "0.1.0",
|
"version": "0.2.1",
|
||||||
"identifier": "com.donutbrowser",
|
"identifier": "com.donutbrowser",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "pnpm dev",
|
"beforeDevCommand": "pnpm dev",
|
||||||
|
|||||||
Reference in New Issue
Block a user