From dbe3da22c19757aa573c55e6e3a46488b8f622cd Mon Sep 17 00:00:00 2001 From: Samuel Date: Wed, 24 Jul 2024 09:27:03 -0400 Subject: [PATCH] fix --- .github/actions/prepare_tauri/action.yml | 7 ++++--- .github/workflows/bundle.yml | 4 ++-- .github/workflows/quality.yml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/actions/prepare_tauri/action.yml b/.github/actions/prepare_tauri/action.yml index 2c32090..c8ee443 100644 --- a/.github/actions/prepare_tauri/action.yml +++ b/.github/actions/prepare_tauri/action.yml @@ -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" @@ -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 diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index 94dc19c..c04012e 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -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: "" @@ -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 diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index d7f717f..aac63de 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -42,7 +42,7 @@ jobs: id: prepare-tauri uses: ./.github/actions/prepare_pnpm with: - working-directory: desktop + platform: ${{ runner.os }} - name: Build run: |