From a2b2f42a6bcc8e36632d889bcc11afaa24540960 Mon Sep 17 00:00:00 2001 From: hrzlgnm Date: Sun, 20 Oct 2024 15:32:10 +0200 Subject: [PATCH] feat: drop appimage bundle and v1 compatible updater (#409) --- .github/workflows/andorid-pr.yml | 17 ----------------- .github/workflows/android-pr.yml | 16 ++++++++++++++++ .github/workflows/desktop-pr.yml | 4 ++-- .github/workflows/desktop-tauri.yml | 1 - src-tauri/tauri.android.conf.json | 2 +- src-tauri/tauri.conf.json | 9 ++++----- 6 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/andorid-pr.yml create mode 100644 .github/workflows/android-pr.yml diff --git a/.github/workflows/andorid-pr.yml b/.github/workflows/andorid-pr.yml deleted file mode 100644 index 475c18d..0000000 --- a/.github/workflows/andorid-pr.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: "📱" - -on: - pull_request: - branches: - - main - -concurrency: - # On main, we want all builds to complete even if merging happens faster to make it easier to discover at which point something broke. - group: ${{ github.ref == 'refs/heads/main' && format('android-main-{0}', github.sha) || format('android-{0}', github.ref) }} - -jobs: - pr: - permissions: - contents: write - uses: ./.github/workflows/android.yml - secrets: inherit diff --git a/.github/workflows/android-pr.yml b/.github/workflows/android-pr.yml new file mode 100644 index 0000000..4ae5a6d --- /dev/null +++ b/.github/workflows/android-pr.yml @@ -0,0 +1,16 @@ +name: "📱" + +on: + pull_request: + branches: + - main + +concurrency: + group: ${{ format('android-{0}', github.ref) }} + cancel-in-progress: true +jobs: + pr: + permissions: + contents: write + uses: ./.github/workflows/android.yml + secrets: inherit diff --git a/.github/workflows/desktop-pr.yml b/.github/workflows/desktop-pr.yml index 7519c95..20f0845 100644 --- a/.github/workflows/desktop-pr.yml +++ b/.github/workflows/desktop-pr.yml @@ -6,8 +6,8 @@ on: - main concurrency: - # On main, we want all builds to complete even if merging happens faster to make it easier to discover at which point something broke. - group: ${{ github.ref == 'refs/heads/main' && format('desktop-main-{0}', github.sha) || format('desktop-{0}', github.ref) }} + group: ${{ format('desktop-{0}', github.ref) }} + cancel-in-progress: true jobs: pr: diff --git a/.github/workflows/desktop-tauri.yml b/.github/workflows/desktop-tauri.yml index 7c273e9..b3e02b4 100644 --- a/.github/workflows/desktop-tauri.yml +++ b/.github/workflows/desktop-tauri.yml @@ -167,7 +167,6 @@ jobs: target/release/bundle/nsis/* target/**/release/bundle/macos/*.tar.gz* target/**/release/bundle/dmg/*.dmg - target/release/bundle/appimage/*.AppImage.* target/release/bundle/deb/*.deb target/**/release/mdns-browser target/release/mdns-browser.exe diff --git a/src-tauri/tauri.android.conf.json b/src-tauri/tauri.android.conf.json index 5be120e..24ae750 100644 --- a/src-tauri/tauri.android.conf.json +++ b/src-tauri/tauri.android.conf.json @@ -9,7 +9,7 @@ "active": false }, "productName": "mDNS Browser", - "version": "0.8.14", + "version": "0.9.0", "identifier": "com.github.hrzlgnm.mdns-browser", "plugins": {}, "app": { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 516fd7b..eaf0d04 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,11 +8,10 @@ "bundle": { "active": true, "targets": [ + "app", "deb", - "appimage", - "nsis", "dmg", - "app" + "nsis" ], "icon": [ "icons/32x32.png", @@ -21,7 +20,7 @@ "icons/icon.icns", "icons/icon.ico" ], - "createUpdaterArtifacts": "v1Compatible", + "createUpdaterArtifacts": true, "linux": { "deb": { "files": { @@ -31,7 +30,7 @@ } }, "productName": "mdns-browser", - "version": "0.8.14", + "version": "0.9.0", "identifier": "com.github.hrzlgnm.mdns-browser", "plugins": { "updater": {