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

Merge master into staging-nixos

parents b998b489 ff08047c

.github/workflows/backport.yml

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

      # Use a GitHub App to create the PR so that CI gets triggered

      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs

      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0

      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1

        id: app-token

        with:

          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}

.github/workflows/bot.yml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ jobs: 
        run: npm install @actions/artifact@5.0.3 bottleneck@2.19.5



      # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.

      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0

      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1

        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID

        id: app-token

        with:

.github/workflows/build.yml

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ jobs: 
        if: |

          contains(matrix.builds, 'manual-nixos') && !cancelled() &&

          contains(fromJSON(inputs.baseBranch).type, 'primary')

        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0

        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

        with:

          name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }}

          path: nixos-manual

.github/workflows/check.yml

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



      - name: Discourage manual edits to certain files

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

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

        with:

          script: |

            require('./trusted/ci/github-script/manual-file-edits.js')({

.github/workflows/comment.yml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ jobs: 
            ci/github-script



      # Use the GitHub App to make sure the reaction happens with the same user who will later merge.

      - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0

      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1

        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID

        id: app-token

        with: