Skip to content

Commit d81946e

Browse files
committed
fix: release
1 parent 419a45c commit d81946e

2 files changed

Lines changed: 26 additions & 29 deletions

File tree

.github/workflows/release.yml

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,52 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
platform: [macos-latest, ubuntu-22.04, windows-latest]
15+
include:
16+
- platform: macos-latest
17+
args: --target aarch64-apple-darwin
18+
- platform: macos-latest
19+
args: --target x86_64-apple-darwin
20+
- platform: ubuntu-22.04
21+
args: ""
22+
- platform: windows-latest
23+
args: ""
1624
runs-on: ${{ matrix.platform }}
1725

1826
steps:
1927
- uses: actions/checkout@v4
2028

21-
- name: setup node
29+
- name: Setup Node
2230
uses: actions/setup-node@v4
2331
with:
2432
node-version: lts/*
2533

26-
- name: install Rust
27-
uses: dtolnay/rust-toolchain@stable
34+
- name: Install Rust nightly
35+
uses: dtolnay/rust-toolchain@nightly
2836
with:
29-
targets: wasm32-unknown-unknown,${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
37+
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
3038

31-
- name: install Tauri cli
32-
run: cargo install tauri-cli
33-
34-
- name: install Tailwind CSS
35-
run: npm i -g tailwindcss
36-
37-
- name: generate Tailwind CSS
38-
run: npx tailwindcss -i ./input.css -o ./style/output.css
39-
40-
- uses: jetli/trunk-action@v0.1.0
41-
with:
42-
# Optional version of trunk to install(eg. 'v0.8.1', 'latest')
43-
version: "latest"
44-
45-
- name: install dependencies (ubuntu only)
39+
- name: Install dependencies (ubuntu only)
4640
if: matrix.platform == 'ubuntu-22.04'
4741
run: |
4842
sudo apt-get update
49-
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
43+
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev libjavascriptcoregtk-4.1-dev
44+
5045
- name: Rust cache
5146
uses: swatinem/rust-cache@v2
5247
with:
5348
workspaces: "./src-tauri -> target"
5449

55-
- name: build in release mode
56-
run: cargo tauri build
50+
- name: Install frontend dependencies
51+
run: yarn install --frozen-lockfile
5752

5853
- uses: tauri-apps/tauri-action@v0
5954
env:
6055
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6156
with:
62-
tagName: ${{ github.ref_name }} # This only works if your workflow triggers on new tags.
63-
releaseName: "RSQL v__VERSION__" # tauri-action replaces \_\_VERSION\_\_ with the app version.
57+
tagName: ${{ github.ref_name }}
58+
releaseName: "RSQL ${{ github.ref_name }}"
6459
releaseBody: "See the assets to download and install this version."
6560
releaseDraft: true
66-
prerelease: ${{ contains(github.ref_name, '-rc.') || contains(github.ref_name, '-rc-') || endsWith(github.ref_name, '-rc') }}
61+
prerelease: ${{ contains(github.ref_name, '-rc') }}
62+
args: ${{ matrix.args }}
63+
tauriScript: npx tauri

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ All IPC command responses bypass Tauri's default `serde_json` serializer. Instea
7474

7575
```bash
7676
# Install dependencies
77-
npm install
77+
yarn install
7878

7979
# Run in development mode
80-
npm run tauri dev
80+
yarn tauri dev
8181

8282
# Build for production
83-
npm run tauri build
83+
yarn tauri build
8484
```

0 commit comments

Comments
 (0)