diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 40e3c7e..fac6c58 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -2,8 +2,8 @@ name: Release on tag on: push: - tags: - - '*' + # tags: + # - '*' jobs: build-and-release: @@ -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 @@ -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 diff --git a/Cargo.lock b/Cargo.lock index 7ea2cb8..396d151 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2911,7 +2911,7 @@ dependencies = [ [[package]] name = "nzskkserv-core" -version = "0.2.0" +version = "0.2.1" dependencies = [ "bytes", "encoding_rs", @@ -2927,7 +2927,7 @@ dependencies = [ [[package]] name = "nzskkserv-gui" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "auto-launch", diff --git a/Cargo.toml b/Cargo.toml index c7b4951..d9c6592 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["nzskkserv-core", "nzskkserv-gui"] resolver = "2" [workspace.package] -version = "0.2.1" +version = "0.2.2" authors = ["nazo6 "] edition = "2021" license = "MIT" diff --git a/nzskkserv-gui/Dioxus.toml b/nzskkserv-gui/Dioxus.toml index 69dc857..7acdb2d 100644 --- a/nzskkserv-gui/Dioxus.toml +++ b/nzskkserv-gui/Dioxus.toml @@ -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] diff --git a/nzskkserv-gui/icons/icon.icns b/nzskkserv-gui/icons/icon.icns new file mode 100644 index 0000000..706ddf0 Binary files /dev/null and b/nzskkserv-gui/icons/icon.icns differ diff --git a/nzskkserv-gui/icons/icon.png b/nzskkserv-gui/icons/icon.png new file mode 100644 index 0000000..ef812cd Binary files /dev/null and b/nzskkserv-gui/icons/icon.png differ diff --git a/package.json b/package.json index cbd55c7..9629a0b 100644 --- a/package.json +++ b/package.json @@ -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": "",