Skip to content

Commit

Permalink
Revert: derive nix profile changes (#1742)
Browse files Browse the repository at this point in the history
## Summary

This reverts commit ad46c20 from #1734
to unblock the upcoming Devbox release.

## How was it tested?

CICD tests should pass
  • Loading branch information
savil authored Jan 23, 2024
1 parent 51c8829 commit 525bb17
Show file tree
Hide file tree
Showing 19 changed files with 273 additions and 454 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/cli-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Build devbox
run: go build -o dist/devbox ./cmd/devbox
- name: Upload devbox artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3
with:
name: devbox-${{ runner.os }}-${{ runner.arch }}
path: ./dist/devbox
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
run: |
chmod +x ./devbox
sudo mv ./devbox /usr/local/bin/
- run: devbox run lint

test:
Expand All @@ -129,8 +129,9 @@ jobs:
run-project-tests: ["project-tests", "project-tests-off"]
# Run tests on:
# 1. the oldest supported nix version (which is 2.9.0? But determinate-systems installer has 2.12.0)
# 2. latest nix version
nix-version: ["2.12.0", "2.19.2"]
# 2. nix version 2.17.0 which introduces a new code path that minimizes nixpkgs downloads.
# 3. latest nix version
nix-version: ["2.12.0", "2.17.0", "2.19.2"]
exclude:
- is-main: "not-main"
os: "${{ inputs.run-mac-tests && 'dummy' || 'macos-latest' }}"
Expand Down Expand Up @@ -199,7 +200,7 @@ jobs:
go test -v -timeout $DEVBOX_GOLANG_TEST_TIMEOUT ./...
auto-nix-install: # ensure Devbox installs nix and works properly after installation.
needs: build-devbox
needs: build-devbox
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
Expand Down
86 changes: 0 additions & 86 deletions internal/devbox/nixprofile.go

This file was deleted.

Loading

0 comments on commit 525bb17

Please sign in to comment.