From bcdd86f5bf6f4e3d614b1cf1ea3f785c59c2c3e8 Mon Sep 17 00:00:00 2001 From: Khue Doan Date: Sat, 25 Apr 2026 14:10:42 +0700 Subject: [PATCH] ci: fix conflicted existing files --- .github/workflows/{build.yaml => test.yaml} | 7 ++++++- scripts/rebuild.py | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) rename .github/workflows/{build.yaml => test.yaml} (85%) diff --git a/.github/workflows/build.yaml b/.github/workflows/test.yaml similarity index 85% rename from .github/workflows/build.yaml rename to .github/workflows/test.yaml index c6b4341..508e9c0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/test.yaml @@ -1,4 +1,4 @@ -name: Build +name: Test on: pull_request: @@ -49,4 +49,9 @@ jobs: - name: Apply test config # TODO permission issue in GHA if using make build run: | + sudo mv /etc/bashrc{,.before-nix-darwin} + sudo mv /etc/zshrc{,.before-nix-darwin} + sudo mv /etc/nix/nix.conf{,.before-nix-darwin} + sudo mv /etc/nix/nix.custom.conf{,.before-nix-darwin} + sudo ./scripts/rebuild.py switch --flake "path:${GITHUB_WORKSPACE}#macos-test" diff --git a/scripts/rebuild.py b/scripts/rebuild.py index 661cbcd..e2ff8cb 100755 --- a/scripts/rebuild.py +++ b/scripts/rebuild.py @@ -50,6 +50,7 @@ def main() -> None: ensure_nix() command = [ "/nix/var/nix/profiles/default/bin/nix", + "--experimental-features", "nix-command flakes", "run", "nix-darwin/nix-darwin-25.11#darwin-rebuild", "--", -- 2.51.2