Unverified Commit 3fc613c5 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge branch 'master' into staging-next

parents e270be8f d0a5c478

.github/workflows/backport.yml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ jobs: 
    if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))

    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v3

      - uses: actions/checkout@v4

        with:

          ref: ${{ github.event.pull_request.head.sha }}

      - name: Create backport PRs

.github/workflows/basic-eval.yml

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ jobs: 
    runs-on: ubuntu-latest

    # 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@v22

    - uses: actions/checkout@v4

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

    - 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-by-name.yml

+9 −4
Original line number Diff line number Diff line
@@ -3,8 +3,10 @@ 
name: Check pkgs/by-name



# The pre-built tool is fetched from a channel,

# making it work predictable on all PRs

on: pull_request

# making it work predictable on all PRs.

on:

  # Using pull_request_target instead of pull_request avoids having to approve first time contributors

  pull_request_target



# The tool doesn't need any permissions, it only outputs success or not based on the checkout

permissions: {}
@@ -15,8 +17,11 @@ jobs: 
    # as specified in nixos/release-combined.nix

    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v3

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

      - uses: actions/checkout@v4

        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@v23

      - name: Determining channel to use for dependencies

        run: |

          echo "Determining which channel to use for PR base branch $GITHUB_BASE_REF"

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

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ jobs: 
    runs-on: ubuntu-latest

    if: github.repository_owner == 'NixOS'

    steps:

      - uses: actions/checkout@v3

      - uses: actions/checkout@v4

        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@v22

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

        with:

          # explicitly enable sandbox

          extra_nix_config: sandbox = true

.github/workflows/editorconfig.yml

+2 −2
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ jobs: 
    - name: print list of changed files

      run: |

        cat "$HOME/changed_files"

    - uses: actions/checkout@v3

    - uses: actions/checkout@v4

      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@v22

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

      with:

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

        # editorconfig-checker 2.4.0