Skip to content

Commit e997433

Browse files
authored
ci: Fix release ci and release v0.2.2
1 parent a3cbc12 commit e997433

File tree

7 files changed

+21
-27
lines changed

7 files changed

+21
-27
lines changed

.github/workflows/release.yaml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Release on tag
22

33
on:
44
push:
5-
tags:
6-
- '*'
5+
# tags:
6+
# - '*'
77

88
jobs:
99
build-and-release:
@@ -13,16 +13,22 @@ jobs:
1313
matrix:
1414
include:
1515
- os: ubuntu-latest
16-
artifact_path: target/dx/nzskkserv-gui/bundle/linux/bundle/*.AppImage
16+
artifact_path: target/dx/nzskkserv-gui/bundle/linux/bundle/appimage/*.AppImage
1717
- os: macos-latest
18-
artifact_path: target/dx/nzskkserv-gui/bundle/macos/bundle/*.dmg
18+
artifact_path: target/dx/nzskkserv-gui/bundle/macos/bundle/dmg/*.dmg
1919
- os: windows-latest
20-
artifact_path: target/dx/nzskkserv-gui/bundle/windows/bundle/*.msi
20+
artifact_path: target/dx/nzskkserv-gui/bundle/windows/bundle/msi/*.msi
2121

2222
steps:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
2525

26+
- name: Install Linux dependencies
27+
if: runner.os == 'Linux'
28+
run: |
29+
sudo apt-get update
30+
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
31+
2632
- name: Setup Rust
2733
uses: dtolnay/rust-toolchain@stable
2834

@@ -35,25 +41,11 @@ jobs:
3541
target
3642
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
3743

38-
- name: Setup Node
39-
uses: actions/setup-node@v4
40-
with:
41-
node-version: '22'
42-
cache: 'pnpm'
43-
44-
- name: Install pnpm
45-
run: npm install -g pnpm
46-
47-
- name: Cache node_modules
48-
uses: actions/cache@v4
44+
- uses: pnpm/action-setup@v4
45+
name: Install pnpm
4946
with:
50-
path: node_modules
51-
key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
52-
restore-keys: |
53-
${{ runner.os }}-pnpm-
54-
55-
- name: Install dependencies
56-
run: pnpm install
47+
version: 10
48+
run_install: true
5749

5850
- name: Install dioxus-cli
5951
uses: taiki-e/install-action@v2

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ members = ["nzskkserv-core", "nzskkserv-gui"]
33
resolver = "2"
44

55
[workspace.package]
6-
version = "0.2.1"
6+
version = "0.2.2"
77
authors = ["nazo6 <git@nazo6.dev>"]
88
edition = "2021"
99
license = "MIT"

nzskkserv-gui/Dioxus.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ name = "nzskkserv"
66
[bundle]
77
identifier = "dev.nazo6.nzskkserv"
88
publisher = "nazo6"
9+
icon = ["icons/icon.ico", "icons/icon.png", "icons/icon.icns"]
910

1011
[web.app]
1112

nzskkserv-gui/icons/icon.icns

32.6 KB
Binary file not shown.

nzskkserv-gui/icons/icon.png

30.6 KB
Loading

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"bundle": "run-s build-tw bundle-dx",
1212
"build-tw": "pnpm tailwindcss -i ./nzskkserv-gui/input.css -o ./nzskkserv-gui/assets/tailwind.css",
1313
"build-dx": "cd nzskkserv-gui && dx build --release",
14-
"bundle-dx": "cd nzskkserv-gui && dx bundle --release"
14+
"bundle-dx_": "cd nzskkserv-gui && cargo build --release",
15+
"bundle-dx": "cd nzskkserv-gui && dx bundle --release --trace"
1516
},
1617
"keywords": [],
1718
"author": "",

0 commit comments

Comments
 (0)