-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: put the nix env var into the right step
- Loading branch information
1 parent
0077c93
commit 39d0ed9
Showing
1 changed file
with
6 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -93,21 +93,20 @@ jobs: | |
# all the other dependencies are already present on the runner images, so we use those | ||
# and just install the missing ones via nix | ||
uses: cachix/install-nix-action@v22 | ||
env: | ||
NIXPKGS_ALLOW_UNFREE: 1 # terraform uses BSL license now, so we have to enable unfree | ||
with: | ||
nix_path: nixpkgs=channel:nixos-unstable | ||
extra_nix_config: | | ||
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||
- uses: workflow/[email protected] | ||
env: | ||
NIXPKGS_ALLOW_UNFREE: 1 # terraform uses BSL license now, so we have to enable unfree | ||
COLLIE_VERSION: ${{ github.event.release.tag_name }} | ||
with: | ||
packages: terraform,terragrunt,terraform-docs | ||
script: | | ||
curl -sf -L https://raw.githubusercontent.com/meshcloud/collie-cli/main/install.sh | sudo bash | ||
collie info | ||
./test/e2e.sh | ||
env: | ||
COLLIE_VERSION: ${{ github.event.release.tag_name }} | ||
e2e-macos: | ||
runs-on: macos-latest | ||
needs: artifacts | ||
|
@@ -118,18 +117,17 @@ jobs: | |
# all the other dependencies are already present on the runner images, so we use those | ||
# and just install the missing ones via nix | ||
uses: cachix/install-nix-action@v22 | ||
env: | ||
NIXPKGS_ALLOW_UNFREE: 1 # terraform uses BSL license now, so we have to enable unfree | ||
with: | ||
nix_path: nixpkgs=channel:nixos-unstable | ||
extra_nix_config: | | ||
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} | ||
- uses: workflow/[email protected] | ||
env: | ||
COLLIE_VERSION: ${{ github.event.release.tag_name }} | ||
NIXPKGS_ALLOW_UNFREE: 1 # terraform uses BSL license now, so we have to enable unfree | ||
with: | ||
packages: terraform,terragrunt,terraform-docs | ||
script: | | ||
curl -sf -L https://raw.githubusercontent.com/meshcloud/collie-cli/main/install.sh | sudo bash | ||
collie info | ||
./test/e2e.sh | ||
env: | ||
COLLIE_VERSION: ${{ github.event.release.tag_name }} |