diff --git a/.github/workflows/cli-tests.yaml b/.github/workflows/cli-tests.yaml index 5137b136547..192c11909e5 100644 --- a/.github/workflows/cli-tests.yaml +++ b/.github/workflows/cli-tests.yaml @@ -83,7 +83,12 @@ jobs: steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - - run: nix build . + - name: Build flake + run: | + if ! nix build .; then + echo "::warning::If this fails, you probably have to run 'devbox run update-hash'" + exit 1 + fi - run: ./result/bin/devbox version golangci-lint: diff --git a/flake.lock b/flake.lock index 4b402869f76..972ce4dfba0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740828860, + "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "type": "github" }, "original": { diff --git a/testscripts/testrunner/testrunner.go b/testscripts/testrunner/testrunner.go index 931c91213ba..869f6e82efa 100644 --- a/testscripts/testrunner/testrunner.go +++ b/testscripts/testrunner/testrunner.go @@ -19,7 +19,7 @@ func Main(m *testing.M) { commands := map[string]func(){ "devbox": func() { // Call the devbox CLI directly: - boxcli.Execute(context.Background(), os.Args[1:]) + os.Exit(boxcli.Execute(context.Background(), os.Args[1:])) }, "print": func() { // Not 'echo' because we don't expand variables fmt.Println(strings.Join(os.Args[1:], " ")) diff --git a/vendor-hash b/vendor-hash index 0094a937260..e09e9bc733a 100644 --- a/vendor-hash +++ b/vendor-hash @@ -1 +1 @@ -sha256-nU+3vFjOAYHRbVJiZuI/78jxDbWB5Ghdt05eWQoeWJA= +sha256-9ZaouEHCuavaRnEVa8cgGrAwyZWXUzyPhcUH02qkfWo=