Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor #61

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
37 changes: 17 additions & 20 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,22 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- 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

- uses: cachix/cachix-action@v12
with:
name: zeek
- name: Julia Version Update
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
nix develop .#update --command nvfetcher-update

- name: Julia Version Update
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
nix develop .#update --command nvfetcher-update

- name: Commit changes
if: ${{ env.COMMIT_MSG != null }}
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: ${{ env.COMMIT_MSG }}
- name: "Create Pull Request"
uses: "peter-evans/create-pull-request@v5"
with:
branch: "auto_update_nightly"
title: "Update nightly versions"
body: |
Automatically updated the nightly version
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/[email protected]

- 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
21 changes: 7 additions & 14 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/[email protected]
- 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 All @@ -52,9 +45,9 @@ jobs:
run: |
nix -Lv develop --command buildProject

- name: Build jlrs -> call_julia
run: |
nix develop ./templates/jlrs --override-input julia2nix ./. --show-trace --command -- call-julia
# - name: Build jlrs -> call_julia
# run: |
# nix develop ./templates/jlrs --override-input julia2nix ./. --show-trace --command -- call-julia

- name: Deploy
uses: JamesIves/[email protected]
Expand Down
Loading