From 5b4f3779727eb00876c7773132445f9b75f337a1 Mon Sep 17 00:00:00 2001 From: Connor Yoh Date: Tue, 8 Jul 2025 10:00:09 +0100 Subject: [PATCH] Updated versions of builders --- .github/workflows/tauri-build.yml | 8 ++++---- .github/workflows/tauri-test.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index 10137b0b1..cb78958e6 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -50,7 +50,7 @@ jobs: - platform: 'macos-latest' args: '--target x86_64-apple-darwin' name: 'macos-x86_64' - - platform: 'ubuntu-20.04' + - platform: 'ubuntu-22.04' args: '' name: 'linux-x86_64' - platform: 'windows-latest' @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-20.04' + if: matrix.platform == 'ubuntu-22.04' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf @@ -76,7 +76,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@0ad00a8b5b3388e41dc48b8dd2912fcdecfb8ca6 # v4.3.1 with: - node-version: 18 + node-version: 20 cache: 'npm' cache-dependency-path: frontend/package-lock.json @@ -112,7 +112,7 @@ jobs: - name: Copy backend JAR to Tauri resources run: | mkdir -p ./frontend/src-tauri/libs - cp ./stirling-pdf/build/libs/Stirling-PDF-*.jar ./frontend/src-tauri/libs/stirling-pdf.jar + cp ./stirling-pdf/build/libs/stirling-pdf-*.jar ./frontend/src-tauri/libs - name: Build Tauri app uses: tauri-apps/tauri-action@6fdd37473788d5a2b4dd80e7ccc0b3c7fe8a5bcd # v0.5.7 diff --git a/.github/workflows/tauri-test.yml b/.github/workflows/tauri-test.yml index ec1a4b828..5f80fc0a9 100644 --- a/.github/workflows/tauri-test.yml +++ b/.github/workflows/tauri-test.yml @@ -53,7 +53,7 @@ jobs: echo 'matrix={"include":[{"platform":"macos-latest","args":"--target aarch64-apple-darwin","name":"macos-aarch64"}]}' >> $GITHUB_OUTPUT ;; "linux") - echo 'matrix={"include":[{"platform":"ubuntu-20.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT + echo 'matrix={"include":[{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT ;; *) echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-latest","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"ubuntu-20.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT @@ -88,7 +88,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'npm' cache-dependency-path: frontend/package-lock.json @@ -124,7 +124,7 @@ jobs: - name: Copy backend JAR to Tauri resources run: | mkdir -p ./frontend/src-tauri/libs - cp ./stirling-pdf/build/libs/Stirling-PDF-*.jar ./frontend/src-tauri/libs/stirling-pdf.jar + cp ./stirling-pdf/build/libs/stirling-pdf-*.jar ./frontend/src-tauri/libs - name: Build Tauri app (test mode) uses: tauri-apps/tauri-action@v0.5