Skip to content

Commit

Permalink
Merge branch 'develop' into workorch-poc-2
Browse files Browse the repository at this point in the history
  • Loading branch information
steveej authored Mar 21, 2024
2 parents 4cb056d + c73d464 commit 6c0965a
Show file tree
Hide file tree
Showing 45 changed files with 1,340 additions and 279 deletions.
5 changes: 5 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
fi

use flake
19 changes: 19 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
on:
pull_request:
push:
branches: [develop]

jobs:
lints:
name: Build
runs-on: ubuntu-22.04
permissions:
id-token: "write"
contents: "read"
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- uses: DeterminateSystems/flake-checker-action@main
# - name: Run `nix build`
# run: nix build .
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
result*
.decrypted~keys.yaml
.storage
.direnv
4 changes: 2 additions & 2 deletions .sops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
keys:
- &steveej 6F7069FE6B96E894E60EC45C6EEFA706CB17E89B
- &jost-s D299483493EAE6B2B3D892B6D33548FA55FF167F
- &dweb-reverse-proxy age1p4udet5m63tccqqpy38d2m90cv4rffe3cn3965jpmakkwcs7t56qvlp2vw
- &dweb-reverse-proxy age1ygzy9clj0xavlmau0ham7j5nw8yy4z0q8hvkfpdgwc4fcr8nufpqrdxgvx
- &linux-builder-01 age1kxkr407jz77ljrhgsfwfmv2yvqjprc6unvx389xp2f48xj8r0vqq2wew5r

creation_rules:
Expand All @@ -30,7 +30,7 @@ creation_rules:
key_groups:
- pgp:
- *steveej
- *jost-s
# - *jost-s
age:
- *dweb-reverse-proxy
- path_regex: ^secrets/nomad/admin/.+$
Expand Down
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"nixEnvSelector.nixFile": "${workspaceRoot}/flake.nix",
"[nix]": {
"editor.defaultFormatter": "kamadorueda.alejandra"
},
}
Loading

0 comments on commit 6c0965a

Please sign in to comment.