Skip to content

Commit

Permalink
refactor: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
GTrunSec committed Oct 30, 2023
1 parent 4b04030 commit 5d8d05c
Show file tree
Hide file tree
Showing 53 changed files with 1,195 additions and 1,272 deletions.
7 changes: 6 additions & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# shellcheck disable=SC1090
source "$(fetchurl "https://raw.githubusercontent.com/paisano-nix/direnv/main/lib" "sha256-R3K8Flvbovj4IOvdlWNtQKLMMSQV464WjG9eU29ixHk=")"
watch_file flakes.nix flake.lock
watch_file local/flake.nix local/flake.lock
# shellcheck disable=SC1090
source "$(fetchurl "https://raw.githubusercontent.com/gtrunsec/direnv/main/lib" "sha256-tuMA8WGkwcYq9V3MtlN6xdVvKd2YkdEpdK4ZyAN6VDM=")"

registry="$PRJ_ROOT/nix/std#__std"

use envreload //julia2nix/devshells/default
13 changes: 3 additions & 10 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,9 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: nixbuild/nix-quick-install-action@v21
with:
nix_conf: |
experimental-features = nix-command flakes
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
with:
name: zeek
- uses: actions/checkout@main
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main

- name: Julia Version Update
env:
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/nix-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@ jobs:

runs-on: macOS-latest
steps:
- uses: actions/checkout@v3.5.3

- uses: nixbuild/nix-quick-install-action@v21
with:
nix_conf: |
experimental-features = nix-command flakes
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@main
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main

- name: Init julia2nix.jl with nix develop
run: |
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/nix-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,9 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: nixbuild/nix-quick-install-action@v21
with:
nix_conf: |
experimental-features = nix-command flakes
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v12
with:
name: zeek
- uses: actions/checkout@main
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main

- name: Nix Flake Show
run: nix flake show
Expand All @@ -30,7 +23,7 @@ jobs:
run: nix develop --show-trace --command -- init

- name: Build JuliaDoc
run: nix run -Lv .#x86_64-linux.julia2nix.entrypoints.mkdoc docs
run: nix run -Lv ./nix/std#x86_64-linux.julia2nix.entrypoints.mkdoc docs

- name: Check Template Shells
run: |
Expand Down
Loading

0 comments on commit 5d8d05c

Please sign in to comment.