Archive/opengoal-launcher
1
0
Fork 0
mirror of https://github.com/open-goal/launcher.git synced 2024-10-19 14:47:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

tauri: update to 1.3.0 and fix release process (#203)

Browse source
This commit is contained in:
Tyler Wilding 2023-05-06 19:42:31 -05:00 committed by GitHub
parent dd68147f1d
commit 5a3c805430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 59 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/release.yaml vendored
View file

@ -91,9 +91,6 @@ jobs:
yarn package
yarn build
- name: Prepare Release Config
run: yarn prepare-release-config
- uses: tauri-apps/tauri-action@v0
name: Build Tauri App
timeout-minutes: 30
@ -102,7 +99,7 @@ jobs:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
configPath: "./.tauri/release-config.combined.json"
args: "--config ./.tauri/release-config.json"
releaseId: ${{needs.create-release.outputs.release_id}}
publish-release:

7
package.json
View file

@ -12,9 +12,8 @@
"package": "node ./scripts/prepare-sidecars.mjs",
"lint": "npx prettier --check .",
"format": "npx prettier --write .",
"prepare-release-config": "node ./scripts/merge-config.js",
"update-release-meta": "node ./scripts/update-release-meta.mjs",
"release": "npm run prepare-release-config && npm run tauri build -- --config ./.tauri/release-config.combined.json",
"release": "npm run tauri build -- --config ./.tauri/release-config.json",
"release-id": "node ./scripts/get-release-id.mjs"
},
"devDependencies": {
@ -25,7 +24,7 @@
"@octokit/rest": "^19.0.7",
"@popperjs/core": "^2.11.7",
"@sveltejs/vite-plugin-svelte": "^2.1.0",
"@tauri-apps/cli": "^1.2.3",
"@tauri-apps/cli": "^1.3.0",
"@tauri-apps/tauricon": "github:tauri-apps/tauricon",
"@tsconfig/svelte": "^3.0.0",
"ansi-to-span": "^0.0.1",
@ -47,7 +46,7 @@
"vite": "^4.3.1"
},
"dependencies": {
"@tauri-apps/api": "^1.2.0",
"@tauri-apps/api": "^1.3.0",
"country-flag-emoji-polyfill": "^0.1.4",
"svelte-navigator": "^3.2.2"
}

18
scripts/merge-config.js
View file

@ -1,18 +0,0 @@
// The tauri-action for Github Actions doesn't let you merge configs
// like can be done with --config on the `tauri` command
// instead it replaces the file
//
// So for now, do the merge ourselves, why? because we don't want to maintain two configs
// that will just end up drifting and breaking on release time.
import { readFileSync, writeFileSync } from "fs";
let releaseOptions = JSON.parse(readFileSync("./.tauri/release-config.json"));
let existingConfig = JSON.parse(readFileSync("./src-tauri/tauri.conf.json"));
existingConfig.tauri.updater = releaseOptions.tauri.updater;
writeFileSync(
"./.tauri/release-config.combined.json",
JSON.stringify(existingConfig, null, 2)
);

2
scripts/update-release-meta.mjs
View file

@ -39,7 +39,7 @@ const octokit = new Octokit({
/*
## What's Changed
* jak1/speedruns: Some final touches for speedrunning in jak 1 by @xTVaser in https://github.com/open-goal/jak-project/pull/1830
* jak1/speedruns: Some final touches for speedrunning in jak 1 by @open-goal in https://github.com/open-goal/jak-project/pull/1830
**Full Changelog**: https://github.com/open-goal/jak-project/compare/v0.1.28...v0.1.29

2
src-tauri/Cargo.toml
View file

@ -31,7 +31,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.96"
sysinfo = "0.28.4"
tar = "0.4.38"
tauri = { version = "1.2.4", features = ["api-all", "devtools", "reqwest-client"] }
tauri = { version = "1.3.0", features = ["api-all", "devtools", "reqwest-client"] }
thiserror = "1.0.40"
tokio = { version = "1", features = ["full"] }
walkdir = "2.3.2"

106
yarn.lock
View file

@ -718,70 +718,70 @@
dependencies:
defer-to-connect "^2.0.1"
"@tauri-apps/api@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.2.0.tgz#1f196b3e012971227f41b98214c846430a4eb477"
integrity sha512-lsI54KI6HGf7VImuf/T9pnoejfgkNoXveP14pVV7XarrQ46rOejIVJLFqHI9sRReJMGdh2YuCoI3cc/yCWCsrw==
"@tauri-apps/api@^1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.3.0.tgz#d0c853ab2cc7506bd826c5f7f260c67c7c15def5"
integrity sha512-AH+3FonkKZNtfRtGrObY38PrzEj4d+1emCbwNGu0V2ENbXjlLHMZQlUh+Bhu/CRmjaIwZMGJ3yFvWaZZgTHoog==
"@tauri-apps/cli-darwin-arm64@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.2.3.tgz#dae9142e683c00199f4d7e088f22b564b08b9cac"
integrity sha512-phJN3fN8FtZZwqXg08bcxfq1+X1JSDglLvRxOxB7VWPq+O5SuB8uLyssjJsu+PIhyZZnIhTGdjhzLSFhSXfLsw==
"@tauri-apps/cli-darwin-arm64@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.3.0.tgz#6c738af14f494546e0fbe64f6befa0eb08959150"
integrity sha512-uuhx3/LaqFyHkoGOnOltBLKWGOzC6WzdXu+/Qv3NmNnyQWkY7O34z5V0oP6ibfuiOBZufKjOuBR+8YAIR8Qh9Q==
"@tauri-apps/cli-darwin-x64@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.2.3.tgz#c6f84a11a1a7800e3e8e22c8fa5b95d0b3d1f802"
integrity sha512-jFZ/y6z8z6v4yliIbXKBXA7BJgtZVMsITmEXSuD6s5+eCOpDhQxbRkr6CA+FFfr+/r96rWSDSgDenDQuSvPAKw==
"@tauri-apps/cli-darwin-x64@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.3.0.tgz#d3fda368b555663723337a70abe4b470592d9bda"
integrity sha512-fj0VXHMDvb/H1CjaS/JoYd7xcourxndJn1IyM4afYbpXibT/fpmM6uZflDI6rRa220NfnBtQvy+asgwC9wuyLA==
"@tauri-apps/cli-linux-arm-gnueabihf@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.2.3.tgz#ecccec4c255ab32903fb36e1c746ed7b4eff0d1d"
integrity sha512-C7h5vqAwXzY0kRGSU00Fj8PudiDWFCiQqqUNI1N+fhCILrzWZB9TPBwdx33ZfXKt/U4+emdIoo/N34v3TiAOmQ==
"@tauri-apps/cli-linux-arm-gnueabihf@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.3.0.tgz#165ed5a299a944a8c0fc1ed5fc0d609db78a142b"
integrity sha512-f80DmFPnH5ZskG61KIlAyMVk9YkrTq0XM2uiQjOo5gToIdJidSwhPQVeBLv+7UxhqaRBx082Dg2fOkWlO3LiOQ==
"@tauri-apps/cli-linux-arm64-gnu@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.2.3.tgz#c3915de83a8fbe6f406eaa0b524a17c091a9a2cd"
integrity sha512-buf1c8sdkuUzVDkGPQpyUdAIIdn5r0UgXU6+H5fGPq/Xzt5K69JzXaeo6fHsZEZghbV0hOK+taKV4J0m30UUMQ==
"@tauri-apps/cli-linux-arm64-gnu@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.3.0.tgz#a68f2efc78e03d1ae59804e61ad9ee6bd78b08c0"
integrity sha512-s6/OByuGoppoUSnOXv/b6Oe6cVFk2w/KHs19aJJpo9ov/dUAA1w9wXlXu2l6sOFGsu/plaVomF2cw3iAQmaUCQ==
"@tauri-apps/cli-linux-arm64-musl@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.2.3.tgz#40f9f7cf0b4088964661fd412eff7310cb4ac605"
integrity sha512-x88wPS9W5xAyk392vc4uNHcKBBvCp0wf4H9JFMF9OBwB7vfd59LbQCFcPSu8f0BI7bPrOsyHqspWHuFL8ojQEA==
"@tauri-apps/cli-linux-arm64-musl@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.3.0.tgz#eff2221408d1040d6f4cbf98a851c16e9eeb11e5"
integrity sha512-yZfZAW4BG92cynL/D4wdrwBAl2oekRwiZnU5CM8k5yncalVEL0tyzuxQjjqbqrtDcw0rdkoBWrhFd+EB89vQaQ==
"@tauri-apps/cli-linux-x64-gnu@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.2.3.tgz#0b3e4c1fda6205dbe872f4b69506669476f60591"
integrity sha512-ZMz1jxEVe0B4/7NJnlPHmwmSIuwiD6ViXKs8F+OWWz2Y4jn5TGxWKFg7DLx5OwQTRvEIZxxT7lXHi5CuTNAxKg==
"@tauri-apps/cli-linux-x64-gnu@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.3.0.tgz#2faaea4272278837df09edae90a9907c4dfe99c4"
integrity sha512-K3KRWSGKh7DTBr/ZKgWzeNX1Vdgx1ZBlUJXsm72R0Hb+93fDEp3TWgiwVkxqecB4aNWJhJsDcvRHuxw1G8xPlA==
"@tauri-apps/cli-linux-x64-musl@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.2.3.tgz#edcf8f53da50337a2e763d4fda750ef56124036c"
integrity sha512-B/az59EjJhdbZDzawEVox0LQu2ZHCZlk8rJf85AMIktIUoAZPFbwyiUv7/zjzA/sY6Nb58OSJgaPL2/IBy7E0A==
"@tauri-apps/cli-linux-x64-musl@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.3.0.tgz#3f678ab7dc441da5582909230934204e23f85f6b"
integrity sha512-99bVHqL1EtF7oESrlmEb5BWJsMNQ2ha70gesZhaVO2qI9Vg089XvrFZWC+aGiUsXNFrOw270+D9DKn03xO5+Zg==
"@tauri-apps/cli-win32-ia32-msvc@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.2.3.tgz#0592d3e4eee4685674579ba897eef1469c6f1cfe"
integrity sha512-ypdO1OdC5ugNJAKO2m3sb1nsd+0TSvMS9Tr5qN/ZSMvtSduaNwrcZ3D7G/iOIanrqu/Nl8t3LYlgPZGBKlw7Ng==
"@tauri-apps/cli-win32-ia32-msvc@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.3.0.tgz#eeaaa3e59cb1f26f5e7d7ce5aa101d5821a5355b"
integrity sha512-ckBUTqXXdnCiYyf2xvxiuqiKZurg7ET++f6yzfvYa+gofd5dagQJkGLlkIg2pJ2c8mhEG1Cfk1vxWPqqGfN2GQ==
"@tauri-apps/cli-win32-x64-msvc@1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.2.3.tgz#89f0cc36e11e56564161602cd6add155cc7b0dfb"
integrity sha512-CsbHQ+XhnV/2csOBBDVfH16cdK00gNyNYUW68isedmqcn8j+s0e9cQ1xXIqi+Hue3awp8g3ImYN5KPepf3UExw==
"@tauri-apps/cli-win32-x64-msvc@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.3.0.tgz#8d67ab0e9bd3ae9e3a9b6e54845e0ca34ab1526c"
integrity sha512-vQ4wqRE0aziyRxgHIOLudGuxx4wETvFnmMvDBaNJRRrZQPlkOKnRxrvj1rNnI1845BdzSbDF4p7JDcFzToAfXA==
"@tauri-apps/cli@^1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.2.3.tgz#957f8a3a370f306e9e1ea5a891cb30aed91af64e"
integrity sha512-erxtXuPhMEGJPBtnhPILD4AjuT81GZsraqpFvXAmEJZ2p8P6t7MVBifCL8LznRknznM3jn90D3M8RNBP3wcXTw==
"@tauri-apps/cli@^1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.3.0.tgz#587b7d6ed34dab04f56f29925626ba1a248e298c"
integrity sha512-H65YQQkE6SBTQ+KlqTmzx7oCL/2p36v2jPFVNHBhZ5EN7g0VLYmImh9TFcB/QsO2aT+sVlRZSmTpL3R0Iiu8pA==
optionalDependencies:
"@tauri-apps/cli-darwin-arm64" "1.2.3"
"@tauri-apps/cli-darwin-x64" "1.2.3"
"@tauri-apps/cli-linux-arm-gnueabihf" "1.2.3"
"@tauri-apps/cli-linux-arm64-gnu" "1.2.3"
"@tauri-apps/cli-linux-arm64-musl" "1.2.3"
"@tauri-apps/cli-linux-x64-gnu" "1.2.3"
"@tauri-apps/cli-linux-x64-musl" "1.2.3"
"@tauri-apps/cli-win32-ia32-msvc" "1.2.3"
"@tauri-apps/cli-win32-x64-msvc" "1.2.3"
"@tauri-apps/cli-darwin-arm64" "1.3.0"
"@tauri-apps/cli-darwin-x64" "1.3.0"
"@tauri-apps/cli-linux-arm-gnueabihf" "1.3.0"
"@tauri-apps/cli-linux-arm64-gnu" "1.3.0"
"@tauri-apps/cli-linux-arm64-musl" "1.3.0"
"@tauri-apps/cli-linux-x64-gnu" "1.3.0"
"@tauri-apps/cli-linux-x64-musl" "1.3.0"
"@tauri-apps/cli-win32-ia32-msvc" "1.3.0"
"@tauri-apps/cli-win32-x64-msvc" "1.3.0"
"@tauri-apps/tauricon@github:tauri-apps/tauricon":
version "1.0.3"