diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
| commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
| tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/.github | |
| parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip | |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/.github')
| -rw-r--r-- | nixpkgs/.github/CODEOWNERS | 14 | ||||
| -rw-r--r-- | nixpkgs/.github/workflows/backport.yml | 2 | ||||
| -rw-r--r-- | nixpkgs/.github/workflows/direct-push.yml | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index 2f5c5950cdb6..64719a7bc3a8 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -82,13 +82,13 @@ /pkgs/development/interpreters/python/conda @DavHau # Haskell -/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn -/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn -/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn -/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn -/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn -/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn -/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn +/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1 +/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1 +/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @expipiplus1 +/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @expipiplus1 +/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @expipiplus1 +/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 +/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl /pkgs/development/interpreters/perl @volth @stigtsp diff --git a/nixpkgs/.github/workflows/backport.yml b/nixpkgs/.github/workflows/backport.yml index 766b5aa831a3..79af5835463d 100644 --- a/nixpkgs/.github/workflows/backport.yml +++ b/nixpkgs/.github/workflows/backport.yml @@ -5,7 +5,7 @@ on: jobs: backport: name: Backport Pull Request - if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true + 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@v2 diff --git a/nixpkgs/.github/workflows/direct-push.yml b/nixpkgs/.github/workflows/direct-push.yml index 6177004295ff..459475c3c6bc 100644 --- a/nixpkgs/.github/workflows/direct-push.yml +++ b/nixpkgs/.github/workflows/direct-push.yml @@ -17,6 +17,9 @@ jobs: run: | ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any') echo "::set-output name=ismerge::$ISMERGE" + # github events are eventually consistent, so wait until changes propagate to thier DB + - run: sleep 60 + if: steps.ismerge.outputs.ismerge != 'true' - name: Warn if the commit was a direct push if: steps.ismerge.outputs.ismerge != 'true' uses: peter-evans/commit-comment@v1 |