Unverified Commit 5407abeb authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

ci/github-script/merge: unify terms for authoring and creating PRs 

I didn't like r-ryantm "authoring"; so I changed that to "created"
earlier. Arguably, using "opened" is more consistent with what is
actually checked and can consistently be used for both.
parent e0c0b2c5

ci/README.md

+2 −2
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ To ensure security and a focused utility, the bot adheres to specific limitation 
- The PR only touches files of packages located under `pkgs/by-name/*`.

- The PR is either:

  - approved by a [committer][@NixOS/nixpkgs-committers].

  - authored by a [committer][@NixOS/nixpkgs-committers].

  - backported via label.

  - created by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).

  - opened by a [committer][@NixOS/nixpkgs-committers].

  - opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).

- The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].

- The user attempting to merge is a maintainer of all packages touched by the PR.

ci/github-script/merge.js

+2 −2
Original line number Diff line number Diff line
@@ -45,11 +45,11 @@ function runChecklist({ 
    'PR touches only files of packages in `pkgs/by-name/`.': allByName,

    'PR is at least one of:': {

      'Approved by a committer.': committers.intersection(approvals).size > 0,

      'Authored by a committer.': committers.has(pull_request.user.id),

      'Backported via label.':

        pull_request.user.login === 'nixpkgs-ci[bot]' &&

        pull_request.head.ref.startsWith('backport-'),

      'Created by r-ryantm.': pull_request.user.login === 'r-ryantm',

      'Opened by a committer.': committers.has(pull_request.user.id),

      'Opened by r-ryantm.': pull_request.user.login === 'r-ryantm',

    },

  }