Skip to content

Commit

Permalink
ci: reuse workflow again; bump upload-artifact version
Browse files Browse the repository at this point in the history
  • Loading branch information
lars-berger committed Feb 10, 2024
1 parent bccb4ae commit 86903ec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
done
shell: bash

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: bundle-${{ matrix.tauri-target }}
if-no-files-found: error
Expand Down
76 changes: 1 addition & 75 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,81 +17,7 @@ concurrency:

jobs:
build:
strategy:
fail-fast: false
matrix:
include:
# MacOS (Intel & Apple Silicon)
- platform: macos-latest
rust-targets: x86_64-apple-darwin,aarch64-apple-darwin
tauri-target: universal-apple-darwin
# 64-bit Linux
- platform: ubuntu-22.04
rust-targets: x86_64-unknown-linux-gnu
tauri-target: x86_64-unknown-linux-gnu
# 64-bit Windows
- platform: windows-latest
rust-targets: x86_64-pc-windows-msvc
tauri-target: x86_64-pc-windows-msvc
# 32-bit Windows
- platform: windows-latest
rust-targets: i686-pc-windows-msvc
tauri-target: i686-pc-windows-msvc

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
with:
version: 8

- uses: actions/setup-node@v4
with:
node-version: 20
cache: pnpm

- uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
with:
toolchain: nightly
targets: ${{ matrix.rust-targets }}

- uses: swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894
with:
workspaces: packages/desktop
shared-key: ${{ matrix.tauri-target }}-${{ hashFiles('packages/desktop/Cargo.lock') }}

- name: Install dependencies (Ubuntu)
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
- run: pnpm i
- run: pnpm build --filter zebar --filter @zebar/client

- uses: tauri-apps/tauri-action@v0
id: tauri
with:
projectPath: packages/desktop
args: --target ${{ matrix.tauri-target }}

- name: Move & rename artifacts
run: |
mkdir tmp
ARTIFACTS='${{ steps.tauri.outputs.artifactPaths }}'
for ARTIFACT in $(echo "$ARTIFACTS" | jq -r '.[]'); do
mv "$ARTIFACT" "tmp/tauri.${ARTIFACT##*.}"
done
shell: bash

- run: echo ${{ github.run_id }}

- uses: actions/upload-artifact@v4
with:
name: bundle-${{ matrix.tauri-target }}
if-no-files-found: error
path: tmp
uses: ./.github/workflows/build.yaml

release:
needs: build
Expand Down

0 comments on commit 86903ec

Please sign in to comment.