Unverified Commit 895e8ce6 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 23c0b3ec 8d603553

.github/workflows/backport.yml

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


      - name: "Add 'has: port to stable' label"

        if: steps.backport.outputs.created_pull_numbers != ''

        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0

        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0

        with:

          # Not using the app on purpose to avoid triggering another workflow run after adding this label.

          script: |

.github/workflows/bot.yml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ jobs: 
        run: gh api /rate_limit | jq



      - name: Run bot

        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0

        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0

        with:

          github-token: ${{ steps.app-token.outputs.token || github.token }}

          retries: 3

.github/workflows/build.yml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ jobs: 
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

          target-as-trusted-at: ${{ inputs.targetSha }}



      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3

      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

        with:

          # Sandbox is disabled on MacOS by default.

          extra_nix_config: sandbox = true

.github/workflows/check.yml

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ jobs: 


      - name: Check commits

        id: check

        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0

        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0

        env:

          TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}

        with:
@@ -85,7 +85,7 @@ jobs: 
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

          target-as-trusted-at: ${{ inputs.targetSha }}



      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3

      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4



      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17

        continue-on-error: true

.github/workflows/comment.yml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ jobs: 
          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}

          permission-pull-requests: write



      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0

      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0

        with:

          github-token: ${{ steps.app-token.outputs.token || github.token }}

          retries: 3