Skip to content

Commit

Permalink
Merge branch 'main' into ubuntu-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Madis0 authored Dec 20, 2024
2 parents 914d328 + 41a11f7 commit 785c65c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build-signed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ jobs:
build-signed:
permissions:
contents: write
runs-on: windows-2022
runs-on: windows-2025
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Install Go
uses: actions/setup-go@v5
- name: Setup pnpm
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
fail-fast: false
matrix:
# maybe update to macOS 14 if this is ARM64-ready?
platform: [macos-13, ubuntu-22.04, windows-2022]
platform: [macos-13, ubuntu-22.04, windows-2025]

runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -51,7 +51,7 @@ jobs:
name: verifier-builds
path: verifier/dist/
- name: Apply +x to verifier
if: matrix.platform != 'windows-2022'
if: matrix.platform != 'windows-2025'
run: chmod +x verifier/dist/*
- name: Setup pnpm
uses: pnpm/action-setup@v3
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
path: src-tauri/target/release/bundle/dmg/*.dmg
- name: Upload the Windows packages
uses: actions/upload-artifact@v4
if: matrix.platform == 'windows-2022'
if: matrix.platform == 'windows-2025'
with:
name: windows-packages
path: src-tauri/target/release/*.exe
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
path: src-tauri/target/debug/bundle/dmg/*.dmg
- name: Upload the Windows packages
uses: actions/upload-artifact@v4
if: matrix.platform == 'windows-2022'
if: matrix.platform == 'windows-2025'
with:
name: windows-packages-debug
path: src-tauri/target/debug/*.exe

0 comments on commit 785c65c

Please sign in to comment.