Skip to content

Commit 6ac67cd

Browse files
authored
Merge branch 'dev' into fix/diagnostics-success-output
2 parents db252e3 + a58d1be commit 6ac67cd

184 files changed

Lines changed: 13545 additions & 7219 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/nix-desktop.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ on:
99
- "nix/**"
1010
- "packages/app/**"
1111
- "packages/desktop/**"
12+
- ".github/workflows/nix-desktop.yml"
1213
pull_request:
1314
paths:
1415
- "flake.nix"
1516
- "flake.lock"
1617
- "nix/**"
1718
- "packages/app/**"
1819
- "packages/desktop/**"
20+
- ".github/workflows/nix-desktop.yml"
1921
workflow_dispatch:
2022

2123
jobs:
@@ -25,6 +27,8 @@ jobs:
2527
matrix:
2628
os:
2729
- blacksmith-4vcpu-ubuntu-2404
30+
- blacksmith-4vcpu-ubuntu-2404-arm
31+
- macos-15-intel
2832
- macos-latest
2933
runs-on: ${{ matrix.os }}
3034
timeout-minutes: 60
@@ -33,7 +37,7 @@ jobs:
3337
uses: actions/checkout@v6
3438

3539
- name: Setup Nix
36-
uses: DeterminateSystems/nix-installer-action@v21
40+
uses: nixbuild/nix-quick-install-action@v34
3741

3842
- name: Build desktop via flake
3943
run: |

0 commit comments

Comments
 (0)