From ba9490ad0044fdaa1d2f8cf4ffa92bc1207d5611 Mon Sep 17 00:00:00 2001 From: chrox Date: Sat, 28 Dec 2024 09:27:05 +0100 Subject: [PATCH] Use ubuntu-22.04 to build Linux binaries to support Debian Bookworm Add Windows arm64 build Fix release notes format --- .github/workflows/release.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e2f3a600..91c37bda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,8 +40,8 @@ jobs: const releaseNotesFileContent = fs.readFileSync('./apps/readest-app/release-notes.json', 'utf8'); const releaseNotes = JSON.parse(releaseNotesFileContent).releases[version] || {}; const notes = releaseNotes.notes || []; - const releaseNote = notes.map(note => `- ${note}`).join('\n'); - console.log('Release note:\n', releaseNote); + const releaseNote = notes.map((note, index) => `${index + 1}. ${note}`).join(' '); + console.log('Formatted release note:', releaseNote); return releaseNote; build-tauri: @@ -52,15 +52,21 @@ jobs: fail-fast: false matrix: config: - - os: ubuntu-latest + - os: ubuntu-22.04 arch: x86_64 rust_target: x86_64-unknown-linux-gnu - os: macos-latest arch: aarch64 rust_target: x86_64-apple-darwin,aarch64-apple-darwin + args: '--target universal-apple-darwin' - os: windows-latest arch: x86_64 rust_target: x86_64-pc-windows-msvc + args: '--target x86_64-pc-windows-msvc' + - os: windows-latest + arch: aarch64 + rust_target: aarch64-pc-windows-msvc + args: '--target aarch64-pc-windows-msvc --bundles nsis' runs-on: ${{ matrix.config.os }} timeout-minutes: 20 @@ -81,9 +87,6 @@ jobs: node-version: 22 cache: pnpm - - name: install rimraf - run: npm install -g rimraf - - name: install dependencies run: pnpm install @@ -111,7 +114,7 @@ jobs: run: cp .env.local apps/readest-app/.env.local - name: install dependencies (ubuntu only) - if: matrix.config.os == 'ubuntu-latest' + if: matrix.config.os == '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 @@ -131,7 +134,7 @@ jobs: projectPath: apps/readest-app releaseId: ${{ needs.get-release.outputs.release_id }} releaseBody: ${{ needs.get-release.outputs.release_note }} - args: ${{ matrix.config.os == 'macos-latest' && '--target universal-apple-darwin' || '' }} + args: ${{ matrix.config.args || '' }} update-release: permissions: