Skip to content

Commit a14825f

Browse files
committed
Merge branch 'dev'
2 parents 6b51d3f + 34a60c6 commit a14825f

File tree

1 file changed

+18
-31
lines changed

1 file changed

+18
-31
lines changed

.github/workflows/desktop.yml

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,60 +5,47 @@ on:
55
branches:
66
- main
77

8+
permissions:
9+
contents: write
10+
811
jobs:
9-
publish-tauri:
10-
permissions:
11-
contents: write
12+
build:
1213
strategy:
13-
fail-fast: false
1414
matrix:
15-
include:
16-
- platform: 'macos-latest' # for Arm based macs (M1 and above).
17-
args: '--target aarch64-apple-darwin'
18-
- platform: 'macos-latest' # for Intel based macs.
19-
args: '--target x86_64-apple-darwin'
20-
- platform: 'ubuntu-22.04'
21-
args: ''
22-
- platform: 'windows-latest'
23-
args: ''
24-
25-
runs-on: ${{ matrix.platform }}
15+
os: [ 'macos-latest', 'ubuntu-22.04', 'windows-latest' ]
16+
runs-on: ${{ matrix.os }}
2617
steps:
2718
- uses: actions/checkout@v4
2819

29-
- name: install dependencies (ubuntu only)
30-
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
20+
- name: Install dependencies (ubuntu only)
21+
if: matrix.os == 'ubuntu-22.04' # This must match the platform value defined above.
3122
run: |
3223
sudo apt-get update
3324
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
3425
35-
- name: setup node
26+
- name: Install Node
3627
uses: actions/setup-node@v4
3728
with:
3829
node-version: lts/*
39-
cache: 'npm' # Set this to npm, yarn or pnpm.
30+
cache: 'npm'
4031
cache-dependency-path: ./package.json
4132

42-
- name: install Rust stable
43-
uses: dtolnay/rust-toolchain@stable # Set this to dtolnay/rust-toolchain@nightly
44-
with:
45-
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
46-
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
33+
- name: Install Rust
34+
uses: dtolnay/rust-toolchain@stable
4735

48-
- name: Rust cache
36+
- name: Rust Cache
4937
uses: swatinem/rust-cache@v2
5038
with:
5139
workspaces: './src-tauri -> target'
5240

53-
- name: install frontend dependencies
54-
# If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
55-
run: npm install # change this to npm or pnpm depending on which one you use.
41+
- name: Install Frontend Dependencies
42+
run: npm install
5643

57-
- uses: tauri-apps/tauri-action@v0.5.16
44+
- name: Build Desktop
45+
uses: tauri-apps/tauri-action@v0.5.16
5846
env:
5947
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6048
with:
61-
tagName: foxogram-${{github.run_id}} # the action automatically replaces \_\_VERSION\_\_ with the app version.
49+
tagName: foxogram-${{github.run_id}}
6250
releaseName: 'Foxogram ${{github.run_id}}'
6351
prerelease: false
64-
args: ${{ matrix.args }}

0 commit comments

Comments
 (0)