Skip to content

Commit 160a82d

Browse files
authored
nix: fix (#22)
* nix: add Direnv support * ignore Nix build artifacts * ci: do not create an out link * ci: re-enable nix hash workflow; add manual trigger * flake: bump inputs * ci: make sure ONLY the relevant file gets committed * build: ensure Nix artifact are not included Avoid accidental inclusions for local build.
1 parent 9814fd4 commit 160a82d

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

.github/workflows/nix-fix.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name: Fix PNPM Dependency Hash
22

3-
# on:
4-
# push:
5-
# branches: [main]
6-
# pull_request:
7-
# branches: [main]
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: [main]
89

910
concurrency:
1011
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
@@ -36,7 +37,7 @@ jobs:
3637

3738
- if: steps.changed-files.outputs.files == 'true'
3839
run: |
39-
if nix build --print-build-logs .#vermilion 2> /tmp/log; then
40+
if nix build -Lv --no-link .#vermilion 2> /tmp/log; then
4041
exit 0
4142
fi
4243
@@ -49,3 +50,4 @@ jobs:
4950
- uses: stefanzweifel/git-auto-commit-action@v5
5051
with:
5152
commit_message: "[CI]: update pnpm dependency hash"
53+
file_pattern: 'nix/package.nix'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,6 @@ dist
134134
.yarn/build-state.yml
135135
.yarn/install-state.gz
136136
.pnp.*
137+
138+
# Nix
139+
result*

electron-builder.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ files:
1010
- '!{.eslintcache,eslint.config.mjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
1111
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
1212
- '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
13+
- '!result*'
1314
asarUnpack:
1415
- resources/**
1516
win:

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)