Compare commits

..

1 Commits

Author SHA1 Message Date
846213dc1f update tests 2023-02-06 13:11:03 +00:00
2 changed files with 7 additions and 13 deletions

View File

@ -61,11 +61,6 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install Nix - name: Install Nix
uses: ./ uses: ./
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- run: nix flake show github:NixOS/nixpkgs - run: nix flake show github:NixOS/nixpkgs
installer-options: installer-options:
@ -78,9 +73,9 @@ jobs:
- name: Install Nix - name: Install Nix
uses: ./ uses: ./
with: with:
nix_path: nixpkgs=channel:nixos-21.05 nix_path: nixpkgs=channel:nixos-22.05
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install install_options: --tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve' install_url: https://nixos-nix-install-tests.cachix.org/serve/s62m7lc0q0mz2mxxm9q0kkrcg90njzhq/install
- run: nix-build test.nix - run: nix-build test.nix
oldest-supported-installer: oldest-supported-installer:
@ -93,8 +88,8 @@ jobs:
- name: Install Nix - name: Install Nix
uses: ./ uses: ./
with: with:
nix_path: nixpkgs=channel:nixos-21.05 nix_path: nixpkgs=channel:nixos-22.05
install_url: https://releases.nixos.org/nix/nix-2.3.8/install install_url: https://releases.nixos.org/nix/nix-2.8.0/install
- run: nix-build test.nix - run: nix-build test.nix
act-support: act-support:

View File

@ -20,7 +20,7 @@ add_config() {
# Set jobs to number of cores # Set jobs to number of cores
add_config "max-jobs = auto" add_config "max-jobs = auto"
# Allow binary caches for user # Allow binary caches for user
add_config "trusted-users = root ${USER:-}" add_config "trusted-users = root $USER"
# Add github access token # Add github access token
if [[ $INPUT_GITHUB_ACCESS_TOKEN != "" ]]; then if [[ $INPUT_GITHUB_ACCESS_TOKEN != "" ]]; then
add_config "access-tokens" "github.com=$INPUT_GITHUB_ACCESS_TOKEN" add_config "access-tokens" "github.com=$INPUT_GITHUB_ACCESS_TOKEN"
@ -86,8 +86,7 @@ fi
# Set paths # Set paths
echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH" echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
# new path for nix 2.14 echo "/nix/var/nix/profiles/per-user/$USER/profile/bin" >> "$GITHUB_PATH"
echo "$HOME/.nix-profile/bin" >> "$GITHUB_PATH"
if [[ $INPUT_NIX_PATH != "" ]]; then if [[ $INPUT_NIX_PATH != "" ]]; then
echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV" echo "NIX_PATH=${INPUT_NIX_PATH}" >> "$GITHUB_ENV"