Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelint committed Jul 24, 2024
1 parent dfbd59f commit dbe3da2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/actions/prepare_tauri/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ description: Prepare a tauri project for upcomming commands

inputs:
platform:
required: true
required: false
type: string
default: ubuntu-latest

runs:
using: "composite"
Expand All @@ -25,10 +26,10 @@ runs:
uses: dtolnay/rust-toolchain@stable
with:
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
targets: ${{ inputs.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
targets: ${{ contains(inputs.platform, 'macos') && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}

- name: install dependencies (ubuntu only)
if: inputs.platform == 'ubuntu-22.04'
if: contains(inputs.platform, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
4 changes: 2 additions & 2 deletions .github/workflows/bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
args: "--target aarch64-apple-darwin"
# - platform: 'macos-latest' # for Intel based macs.
# args: '--target x86_64-apple-darwin'
- platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
- platform: "ubuntu-22.04"
args: ""
- platform: "windows-latest"
args: ""
Expand All @@ -98,7 +98,7 @@ jobs:
id: prepare-tauri
uses: ./.github/actions/prepare_pnpm
with:
working-directory: desktop
platform: ${{ matrix.platform }}

- name: Get Tags
id: tag
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
id: prepare-tauri
uses: ./.github/actions/prepare_pnpm
with:
working-directory: desktop
platform: ${{ runner.os }}

- name: Build
run: |
Expand Down

0 comments on commit dbe3da2

Please sign in to comment.