ci/modules_test: use flake-enabled nix
This commit is contained in:
parent
81bf18b5ab
commit
b625325487
11
.cirrus.yml
11
.cirrus.yml
@ -7,11 +7,13 @@ task:
|
|||||||
# Use the maximum timeout. Needed when rebuilding packages on a channel update.
|
# Use the maximum timeout. Needed when rebuilding packages on a channel update.
|
||||||
timeout_in: 120m
|
timeout_in: 120m
|
||||||
|
|
||||||
|
container:
|
||||||
|
# Defined in https://github.com/nix-community/docker-nixpkgs
|
||||||
|
image: nixpkgs/nix-flakes:nixos-22.05
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
- name: modules_test
|
- name: modules_test
|
||||||
container:
|
container:
|
||||||
# Use Nix release 2.3.x, the default on NixOS stable
|
|
||||||
image: nixos/nix:2.3.12
|
|
||||||
# Besides virtualization, this also enables privileged containers which are required for
|
# Besides virtualization, this also enables privileged containers which are required for
|
||||||
# sandboxed builds
|
# sandboxed builds
|
||||||
kvm: true
|
kvm: true
|
||||||
@ -28,12 +30,9 @@ task:
|
|||||||
# This script is run as root
|
# This script is run as root
|
||||||
build_script:
|
build_script:
|
||||||
- echo "sandbox = true" >> /etc/nix/nix.conf
|
- echo "sandbox = true" >> /etc/nix/nix.conf
|
||||||
- export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix nixpkgs)"
|
- nix shell --inputs-from . nixpkgs#{bash,coreutils,gawk,cachix} -c ./test/ci/build.sh
|
||||||
- nix run -f '<nixpkgs>' bash coreutils cachix -c ./test/ci/build.sh
|
|
||||||
|
|
||||||
- name: flake
|
- name: flake
|
||||||
container:
|
|
||||||
image: nixpkgs/nix-flakes
|
|
||||||
build_script:
|
build_script:
|
||||||
- nix flake check
|
- nix flake check
|
||||||
- ./test/nixos-search/ci-test.sh
|
- ./test/nixos-search/ci-test.sh
|
||||||
|
@ -16,6 +16,4 @@ if [[ -v CIRRUS_CI ]]; then
|
|||||||
chmod o+rw /dev/kvm
|
chmod o+rw /dev/kvm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$NIX_PATH ($(nix eval --raw nixpkgs.lib.version))"
|
"${BASH_SOURCE[0]%/*}/../run-tests.sh" --ci --scenario "$scenario"
|
||||||
|
|
||||||
"${BASH_SOURCE[0]%/*}/../run-tests.sh" --ci --scenario $scenario
|
|
||||||
|
Loading…
Reference in New Issue
Block a user