Compare commits

...

2 Commits

Author SHA1 Message Date
b75e6b0124 Merge pull request 'fix: avoid PATH override that hides bash on runners' (#45) from stage into master
Some checks failed
Terraform Apply / Terraform Apply (push) Failing after 4m55s
Reviewed-on: #45
2026-02-28 17:01:34 +00:00
b6ce31ad6c fix: avoid PATH override that hides bash on runners
All checks were successful
Terraform Plan / Terraform Plan (push) Successful in 17s
2026-02-28 17:01:00 +00:00
2 changed files with 2 additions and 4 deletions

View File

@@ -144,7 +144,6 @@ jobs:
- name: Run cluster rebuild and bootstrap
env:
NIX_CONFIG: experimental-features = nix-command flakes
PATH: $HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:${{ env.PATH }}
run: |
if [ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
@@ -152,6 +151,6 @@ jobs:
. /root/.nix-profile/etc/profile.d/nix.sh
fi
export PATH="$HOME/.nix-profile/bin:/root/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
export PATH="$HOME/.nix-profile/bin:/root/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
./nixos/kubeadm/scripts/rebuild-and-bootstrap.sh

View File

@@ -133,7 +133,6 @@ jobs:
- name: Rebuild and bootstrap/reconcile kubeadm cluster
env:
NIX_CONFIG: experimental-features = nix-command flakes
PATH: $HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:${{ env.PATH }}
run: |
if [ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
@@ -141,6 +140,6 @@ jobs:
. /root/.nix-profile/etc/profile.d/nix.sh
fi
export PATH="$HOME/.nix-profile/bin:/root/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
export PATH="$HOME/.nix-profile/bin:/root/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
./nixos/kubeadm/scripts/rebuild-and-bootstrap.sh