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

Merge staging-next into staging

parents 863612f3 e5ae9b17

.github/labeler.yml

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ 
      - changed-files:

          - any-glob-to-any-file:

              - nixos/modules/services/desktops/pantheon/**/*

              - nixos/modules/services/x11/desktop-managers/pantheon.nix

              - nixos/modules/services/desktop-managers/pantheon.nix

              - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix

              - nixos/tests/pantheon.nix

              - pkgs/desktops/pantheon/**/*

.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@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1

      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4

        id: app-token

        with:

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

.github/workflows/check.yml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ jobs: 
      - name: Build codeowners validator

        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator



      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1

      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4

        if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID

        id: app-token

        with:

.github/workflows/edited.yml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ jobs: 
      # 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

      # We only need Pull Requests: write here, but the app is also used for backports.

      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1

      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4

        id: app-token

        with:

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

.github/workflows/labels.yml

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



      # 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@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1

      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4

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

        id: app-token

        with: