mirror of
https://github.com/open-goal/launcher.git
synced 2024-10-20 04:57:38 -04:00
Merge pull request #37 from xTVaser/v/fix-linux-release-builds
release: add `libglew` to linux dependencies to fix appimage creation
This commit is contained in:
commit
13551a90ac
2
.github/workflows/build.yaml
vendored
2
.github/workflows/build.yaml
vendored
|
@ -35,7 +35,7 @@ jobs:
|
|||
if: matrix.platform == 'ubuntu-latest'
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
|
||||
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev libglew2.1 patchelf
|
||||
|
||||
- name: install app dependencies and build it
|
||||
run: |
|
||||
|
|
7
.github/workflows/release.yaml
vendored
7
.github/workflows/release.yaml
vendored
|
@ -37,7 +37,7 @@ jobs:
|
|||
if: matrix.platform == 'ubuntu-latest'
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
|
||||
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev libglew2.1 patchelf
|
||||
|
||||
- name: install app dependencies
|
||||
run: |
|
||||
|
@ -55,6 +55,10 @@ jobs:
|
|||
popd
|
||||
node ./.github/scripts/download-binaries/index.js
|
||||
|
||||
- name: prepare release config
|
||||
run: |
|
||||
npm run prepare-release-config
|
||||
|
||||
- name: prepare resources for build
|
||||
if: matrix.os == 'windows'
|
||||
run: |
|
||||
|
@ -86,6 +90,7 @@ jobs:
|
|||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
||||
with:
|
||||
configPath: "./.tauri/release-config.combined.json"
|
||||
tagName: "v__VERSION__"
|
||||
releaseName: "OpenGOAL Launcher v__VERSION__"
|
||||
releaseBody: "See the assets to download this version and install."
|
||||
|
|
1
.tauri/.gitignore
vendored
Normal file
1
.tauri/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
release-config.combined.json
|
12
.tauri/release-config.json
Normal file
12
.tauri/release-config.json
Normal file
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"tauri": {
|
||||
"updater": {
|
||||
"active": true,
|
||||
"endpoints": [
|
||||
"https://raw.githubusercontent.com/open-goal/launcher/main/.tauri/latest-release.json"
|
||||
],
|
||||
"dialog": true,
|
||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEJGQjRCQzI1N0I4REZBMzIKUldReStvMTdKYnkwditmb2IvK3hJUm9xdjJMMlN2N2tRejlON0djdE03YnhGOHlaTzVwUy9IY2YK"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -13,7 +13,9 @@
|
|||
"update-bin": "node ./scripts/update-binaries.js && npm run package",
|
||||
"lint": "npx prettier --check .",
|
||||
"format": "npx prettier --write .",
|
||||
"mock-bin": "node ./scripts/dummy-binaries.js"
|
||||
"mock-bin": "node ./scripts/dummy-binaries.js",
|
||||
"prepare-release-config": "node ./scripts/merge-config.js",
|
||||
"release": "npm run prepare-release-config && npm run tauri build -- --config ./.tauri/release-config.combined.json"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.30",
|
||||
|
|
18
scripts/merge-config.js
Normal file
18
scripts/merge-config.js
Normal file
|
@ -0,0 +1,18 @@
|
|||
// 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
src-tauri/Cargo.lock
generated
2
src-tauri/Cargo.lock
generated
|
@ -55,7 +55,7 @@ checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
|
|||
|
||||
[[package]]
|
||||
name = "app"
|
||||
version = "0.0.1"
|
||||
version = "0.2.2"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
|
@ -45,14 +45,6 @@
|
|||
"timestampUrl": ""
|
||||
}
|
||||
},
|
||||
"updater": {
|
||||
"active": true,
|
||||
"endpoints": [
|
||||
"https://raw.githubusercontent.com/open-goal/launcher/main/.tauri/latest-release.json"
|
||||
],
|
||||
"dialog": true,
|
||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEJGQjRCQzI1N0I4REZBMzIKUldReStvMTdKYnkwditmb2IvK3hJUm9xdjJMMlN2N2tRejlON0djdE03YnhGOHlaTzVwUy9IY2YK"
|
||||
},
|
||||
"allowlist": {
|
||||
"all": true,
|
||||
"fs": {
|
||||
|
|
Loading…
Reference in a new issue