Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Release on tag

on:
push:
tags:
- '*'
# tags:
# - '*'

jobs:
build-and-release:
Expand All @@ -13,16 +13,22 @@ jobs:
matrix:
include:
- os: ubuntu-latest
artifact_path: target/dx/nzskkserv-gui/bundle/linux/bundle/*.AppImage
artifact_path: target/dx/nzskkserv-gui/bundle/linux/bundle/appimage/*.AppImage
- os: macos-latest
artifact_path: target/dx/nzskkserv-gui/bundle/macos/bundle/*.dmg
artifact_path: target/dx/nzskkserv-gui/bundle/macos/bundle/dmg/*.dmg
- os: windows-latest
artifact_path: target/dx/nzskkserv-gui/bundle/windows/bundle/*.msi
artifact_path: target/dx/nzskkserv-gui/bundle/windows/bundle/msi/*.msi

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Linux dependencies
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev

- name: Setup Rust
uses: dtolnay/rust-toolchain@stable

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

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '22'
cache: 'pnpm'

- name: Install pnpm
run: npm install -g pnpm

- name: Cache node_modules
uses: actions/cache@v4
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
path: node_modules
key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-

- name: Install dependencies
run: pnpm install
version: 10
run_install: true

- name: Install dioxus-cli
uses: taiki-e/install-action@v2
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["nzskkserv-core", "nzskkserv-gui"]
resolver = "2"

[workspace.package]
version = "0.2.1"
version = "0.2.2"
authors = ["nazo6 <git@nazo6.dev>"]
edition = "2021"
license = "MIT"
Expand Down
1 change: 1 addition & 0 deletions nzskkserv-gui/Dioxus.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ name = "nzskkserv"
[bundle]
identifier = "dev.nazo6.nzskkserv"
publisher = "nazo6"
icon = ["icons/icon.ico", "icons/icon.png", "icons/icon.icns"]

[web.app]

Expand Down
Binary file added nzskkserv-gui/icons/icon.icns
Binary file not shown.
Binary file added nzskkserv-gui/icons/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"bundle": "run-s build-tw bundle-dx",
"build-tw": "pnpm tailwindcss -i ./nzskkserv-gui/input.css -o ./nzskkserv-gui/assets/tailwind.css",
"build-dx": "cd nzskkserv-gui && dx build --release",
"bundle-dx": "cd nzskkserv-gui && dx bundle --release"
"bundle-dx_": "cd nzskkserv-gui && cargo build --release",
"bundle-dx": "cd nzskkserv-gui && dx bundle --release --trace"
},
"keywords": [],
"author": "",
Expand Down