Unverified Commit 8ca315db authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 5b831825 29514a2b

.github/workflows/basic-eval.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ jobs: 
    # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback

    steps:

    - uses: actions/checkout@v3

    - uses: cachix/install-nix-action@v20

    - uses: cachix/install-nix-action@v21

    - uses: cachix/cachix-action@v12

      with:

        # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

.github/workflows/check-maintainers-sorted.yaml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ jobs: 
        with:

          # pull_request_target checks out the base branch by default

          ref: refs/pull/${{ github.event.pull_request.number }}/merge

      - uses: cachix/install-nix-action@v20

      - uses: cachix/install-nix-action@v21

        with:

          # explicitly enable sandbox

          extra_nix_config: sandbox = true

.github/workflows/editorconfig.yml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ jobs: 
      with:

        # pull_request_target checks out the base branch by default

        ref: refs/pull/${{ github.event.pull_request.number }}/merge

    - uses: cachix/install-nix-action@v20

    - uses: cachix/install-nix-action@v21

      with:

        # nixpkgs commit is pinned so that it doesn't break

        # editorconfig-checker 2.4.0

.github/workflows/manual-nixos.yml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ jobs: 
        with:

          # pull_request_target checks out the base branch by default

          ref: refs/pull/${{ github.event.pull_request.number }}/merge

      - uses: cachix/install-nix-action@v20

      - uses: cachix/install-nix-action@v21

        with:

          # explicitly enable sandbox

          extra_nix_config: sandbox = true

.github/workflows/manual-nixpkgs.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ jobs: 
        with:

          # pull_request_target checks out the base branch by default

          ref: refs/pull/${{ github.event.pull_request.number }}/merge

      - uses: cachix/install-nix-action@v20

      - uses: cachix/install-nix-action@v21

        with:

          # explicitly enable sandbox

          extra_nix_config: sandbox = true