Commit 0c45a8b5 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents a54a74f9 15cfe191

.git-blame-ignore-revs

+3 −0
Original line number Diff line number Diff line
@@ -200,3 +200,6 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b 
4cec81a9959ce612b653860dcca53101a36f328a

# Final commit that does the formatting

88b285c01d84de82c0b2b052fd28eaf6709c2d26



# sqlc: format with nixfmt

2bdec131b2bb2c8563f4556d741d34ccb77409e2

.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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

        with:

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

      - name: Create backport PRs

.github/workflows/basic-eval.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

    - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30

    - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15

      with:

.github/workflows/check-cherry-picks.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ jobs: 
    runs-on: ubuntu-latest

    if: github.repository_owner == 'NixOS'

    steps:

    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      with:

        fetch-depth: 0

        filter: blob:none

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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ jobs: 
    runs-on: ubuntu-latest

    if: github.repository_owner == 'NixOS'

    steps:

      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

        with:

          # pull_request_target checks out the base branch by default

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