Skip to content

Commit

Permalink
fix(theseus): Updater & app release action
Browse files Browse the repository at this point in the history
  • Loading branch information
Norbiros committed Aug 24, 2024
1 parent 15eb369 commit 3eebefa
Show file tree
Hide file tree
Showing 9 changed files with 240 additions and 14 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
args: "--target universal-apple-darwin --config ./apps/app/tauri-release.conf.json"
args: "--target universal-apple-darwin"
tauriScript: pnpm --filter=@modrinth/app run tauri

- name: build app
Expand All @@ -110,7 +110,6 @@ jobs:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
args: "--config ./apps/app/tauri-release.conf.json"
tauriScript: pnpm --filter=@modrinth/app run tauri

- name: upload ${{ matrix.platform }}
Expand Down
106 changes: 105 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ tauri-plugin-deep-link = "2.0.0-rc"
tauri-plugin-os = "2.0.0-rc"
tauri-plugin-shell = "2.0.0-rc"
tauri-plugin-dialog = "2.0.0-rc"
tauri-plugin-updater = "2.0.0-rc.1"

tokio = { version = "1", features = ["full"] }
thiserror = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion apps/app/gen/schemas/acl-manifests.json

Large diffs are not rendered by default.

63 changes: 63 additions & 0 deletions apps/app/gen/schemas/desktop-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3925,6 +3925,69 @@
"tags:deny-tags-get-tag-bundle"
]
},
{
"description": "updater:default -> This permission set configures which kind of\nupdater functions are exposed to the frontend.\n\n#### Granted Permissions\n\nThe full workflow from checking for updates to installing them\nis enabled.\n\n",
"type": "string",
"enum": [
"updater:default"
]
},
{
"description": "updater:allow-check -> Enables the check command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-check"
]
},
{
"description": "updater:allow-download -> Enables the download command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-download"
]
},
{
"description": "updater:allow-download-and-install -> Enables the download_and_install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-download-and-install"
]
},
{
"description": "updater:allow-install -> Enables the install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-install"
]
},
{
"description": "updater:deny-check -> Denies the check command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-check"
]
},
{
"description": "updater:deny-download -> Denies the download command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-download"
]
},
{
"description": "updater:deny-download-and-install -> Denies the download_and_install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-download-and-install"
]
},
{
"description": "updater:deny-install -> Denies the install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-install"
]
},
{
"description": "utils:default -> Default plugin permissions.",
"type": "string",
Expand Down
63 changes: 63 additions & 0 deletions apps/app/gen/schemas/linux-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3925,6 +3925,69 @@
"tags:deny-tags-get-tag-bundle"
]
},
{
"description": "updater:default -> This permission set configures which kind of\nupdater functions are exposed to the frontend.\n\n#### Granted Permissions\n\nThe full workflow from checking for updates to installing them\nis enabled.\n\n",
"type": "string",
"enum": [
"updater:default"
]
},
{
"description": "updater:allow-check -> Enables the check command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-check"
]
},
{
"description": "updater:allow-download -> Enables the download command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-download"
]
},
{
"description": "updater:allow-download-and-install -> Enables the download_and_install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-download-and-install"
]
},
{
"description": "updater:allow-install -> Enables the install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:allow-install"
]
},
{
"description": "updater:deny-check -> Denies the check command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-check"
]
},
{
"description": "updater:deny-download -> Denies the download command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-download"
]
},
{
"description": "updater:deny-download-and-install -> Denies the download_and_install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-download-and-install"
]
},
{
"description": "updater:deny-install -> Denies the install command without any pre-configured scope.",
"type": "string",
"enum": [
"updater:deny-install"
]
},
{
"description": "utils:default -> Default plugin permissions.",
"type": "string",
Expand Down
1 change: 1 addition & 0 deletions apps/app/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ fn main() {
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_deep_link::init())
.plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_window_state::Builder::default().build())
.setup(|app| {
#[cfg(target_os = "macos")]
Expand Down
10 changes: 0 additions & 10 deletions apps/app/tauri-release.conf.json

This file was deleted.

5 changes: 5 additions & 0 deletions apps/app/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"copyright": "",
"targets": "all",
"externalBin": [],
"createUpdaterArtifacts": true,
"icon": [
"icons/128x128.png",
"icons/128x128@2x.png",
Expand Down Expand Up @@ -50,6 +51,10 @@
"schemes": ["modrinth"]
},
"mobile": []
},
"updater": {
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIwMzM5QkE0M0FCOERBMzkKUldRNTJyZzZwSnN6SUdPRGdZREtUUGxMblZqeG9OVHYxRUlRTzJBc2U3MUNJaDMvZDQ1UytZZmYK",
"endpoints": ["https://launcher-files.modrinth.com/updates.json"]
}
},
"app": {
Expand Down

0 comments on commit 3eebefa

Please sign in to comment.