Commit Graph

306 Commits

Author SHA1 Message Date
Malte Brandy
4acf281f00
.github/workflows/periodic-merge-*: Tiny improvements 2021-07-01 00:44:37 +02:00
Martin Weinelt
3f40ca48bc
.github/workflows/periodic-merge: generalize from merge-staging
By generalizing the previous merge-staging action we can support a large
number of branch pairs that need to be merged periodically.

Provide two intervals, daily and every six hours, to accomodate
different needs.

Co-Authored-By: Malte Brandy <malte.brandy@maralorn.de>
2021-06-30 22:42:16 +02:00
Niklas Hambüchen
3c29ced243 CONTRIBUTING.md: Move to repo root, where it is more visible.
We found that many users found it difficult to locate this document.

Github supports it in the root, see:
https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors
2021-06-26 04:51:38 +02:00
Niklas Hambüchen
f93aa9b94b backporting action: Link to backporting criteria.
Automation tools should instruct their users clearly what tasks are still on the user.

Updates the bot's version to get the `pull_description` feature:
https://github.com/zeebe-io/backport-action/pull/64
2021-06-26 04:51:11 +02:00
Ryan Mulligan
f91d7910ea doc: cleanup documentation relating to release notes
Also delete empty release notes file.
2021-06-23 11:04:22 -07:00
Domen Kožar
49bbb40680
Merge pull request #126826 from domenkozar/direct-push-eventually-consistent
direct-push action: delay to workaround eventually consistent DB
2021-06-19 15:52:13 +02:00
Domen Kožar
e3858348c4
Merge pull request #126825 from domenkozar/backport-label-check
backport action: run only when the label starts with 'backport'
2021-06-19 15:51:37 +02:00
Joe Hermaszewski
7a0b55c042
CODEOWNERS: add expipiplus1 for Haskell files 2021-06-16 12:17:11 +08:00
Domen Kožar
b390b929bd
direct-push action: delay to workaround eventually consistent DB 2021-06-14 13:47:22 +02:00
Domen Kožar
527686e761
backport action: run only when the label starts with 'backport' 2021-06-14 13:41:10 +02:00
zowoq
1ea409a4f0 .github/workflows/rebase.yml: remove
It only works sometimes and we're unable to fix it.
2021-06-09 23:44:26 +10:00
Elis Hirwing
9701ce85a3
Merge pull request #126191 from etu/php-extensions-meta
php: Improve extensions meta and codeowner data
2021-06-09 13:30:37 +02:00
Jonathan Ringer
0a6008f4e5 doc/manual: Add backport criteria 2021-06-09 00:13:49 -07:00
Jonathan Ringer
9d350d84c1 .github/CONTRIBUTING.md: Add backport release criteria 2021-06-09 00:13:49 -07:00
Elis Hirwing
5da1daec6c
codeowners: Add all @NixOS/php team members to codeowners list 2021-06-08 14:20:48 +02:00
Jan Tojnar
c0d04fe53c
codeowners: add jtojnar to php
I am maintaining out-of-tree PHP expressions (https://github.com/fossar/nix-phps)
so I would like to get notified of changes of the code I depend on,
even though I cannot commit to becoming a PHP maintaintainer at the moment.
2021-06-06 09:40:41 +02:00
Pavol Rusnak
576c2f555e pull_request_template: fix link to CONTRIBUTING.md 2021-06-05 08:27:10 -07:00
Jonathan Ringer
291dcac830
pull_request_template: Add release note criteria 2021-06-02 13:37:14 -07:00
Jonathan Ringer
428d44b2fd
.github/CONTRIBUTING.md: Add 21.11 release-notes steps 2021-06-02 13:35:43 -07:00
Ryan Mulligan
0d2757302c .github/workflows/nixos-manual.yml: add permisssions so action runs don't require approval 2021-06-02 19:02:51 +10:00
Domen Kožar
9a80dbab1f
backport: trigger also if label is set after the merge 2021-05-28 16:36:02 +02:00
Domen Kožar
95fa2dda18
backport: set correct permissions 2021-05-28 16:35:13 +02:00
DavHau
6c0b85cf3a buildPythonPackage: add support for conda 2021-05-28 14:31:40 +02:00
zowoq
8917ffe723 .github/workflows/merge-staging.yml: change condition to repository_owner
This is consistent with the other actions.
2021-05-28 08:10:53 +10:00
zowoq
67a8283653 .github/workflows/manual-{nixos,nixpkgs}.yml: add repository_owner condition
We have this set in the other actions, it prevents the action from
running in PRs made against forks.
2021-05-28 08:10:53 +10:00
Martin Weinelt
4f6b97f2ac .github/workflows/rebase.yml: update for 21.05
Adds three more valid branches to the rebase action.
2021-05-26 14:19:15 +10:00
Domen Kožar
d71078f4f4
Merge pull request #124273 from NixOS/backporting-action
Add backporting action
2021-05-25 11:38:29 +02:00
Domen Kožar
b26fc090cb
backport action: comment to keep pin in sync 2021-05-25 09:44:35 +02:00
Domen Kožar
68e65592e3
Update .github/workflows/backport.yml
Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2021-05-25 09:41:07 +02:00
Domen Kožar
fb3da87aa3
Update .github/workflows/backport.yml
Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2021-05-25 07:14:12 +02:00
zowoq
8cb51f8c74 .github/workflows/nixos-manual.yml: add repository_owner condition
We have this set in the other actions, it prevents the action from
running in PRs made against forks.
2021-05-25 08:36:08 +10:00
Andreas Rammhold
7a47055a0f
Merge pull request #124266 from andir/codeowners
CODEOWNERS: merge the neovim lines as they are not additive
2021-05-24 20:30:59 +02:00
Domen Kožar
031ea8124c
Add backporting action
If "backport <branch>" label is applied to a PR,
once the PR is merged, github-actions bot will create another PR targeting
<branch> and cherry-picking commits.
2021-05-24 17:54:29 +02:00
Andreas Rammhold
fb1d3d68db
CODEOWNERS: merge the neovim lines as they are not additive
CODEOWNERS files always take that *last* match for a specific match.
Having two lines for the same path will only ever result in the last
line being used. The intention here was that both of these individuals
are owners of the neovim space and not just one.
2021-05-24 16:46:33 +02:00
Ryan Mulligan
a67febac45 CODEOWNERS: add ryantm to /nixos/doc 2021-05-22 18:14:49 -07:00
Ryan Mulligan
6c14851943 nixos/doc: add md-to-db.sh, convert "Building Your Own NixOS CD" to CommonMark 2021-05-22 18:14:49 -07:00
Léo Gaspard
211fee9c43
pull request template: cleanup (#117537)
Remove elements of the PR template that have a low signal/noise ratio,
and add one that I think would have a good signal/noise ratio.

-----
Remove:
Determined the impact on package closure size (by running `nix path-info
-S` before and after)
-----
Rationale:
This is rarely done in practice, and apart from for specific packages
this is usually not a good indicator of anything useful

It might make sense to re-introduce it with two holes to fill, but then
we would have to make a serious decision to never land without these two
numbers filled in or with too big a regression, because in practice this
box has been a no-op in many cases.

Maybe just integrating this check in nixpkgs-review would bring the most
benefit here?
-----

-----
Remove:
Ensured that relevant documentation is up to date
-----
Rationale:
This is fuzzy, “relevant documentation” is way too often hard to find
-----

-----
Add:
Added a release notes entry if the change is major or breaking
-----
Rationale:
This is way too often forgotten, and is also a self-contained easy task
-----
2021-05-21 03:06:21 +02:00
Jan Tojnar
6225647cfc
.github/workflows/merge-staging.yml: Include branch in comment
If I receive the mail notification that staging(-next) merge failed,
I either need to check `git log staging-next` or click the action run link
to find out where should I resolve the conflict.

To save time, let’s include the information about which step failed right in the comment.
2021-05-13 13:58:14 +02:00
Jan Tojnar
8a32c47586 .github/labeler.yml: Update GNOME file patterns
This got missed in the move (https://github.com/NixOS/nixpkgs/pull/122107) because it is in a “hidden” directory.
2021-05-12 19:38:41 +02:00
sternenseemann
ef9631e523 pkgs/top-level: init expression for haskell-updates jobset
release-haskell.nix is intended to be a replacement for
https://github.com/peti/ci/blob/master/haskell-nixpkgs.nix
which is currently the main expression for the haskell-updates jobset
on hydra (in the nixpkgs project).

It has the same jobs as the old haskell-nixpkgs.nix file:

* haskellPackages.*
* haskell.compiler.*
* Some extra haskell packages for certain compilers

The following jobs are new:

* tests.haskell.*
* A manually maintained list of top-level haskell packages (most of them
  using justStaticExecutables)
* An aggregate job which is intended to aid merging the haskell-updates
  branch: It holds an arbitrary list of haskell-related packages and
  tests we intend have working at all times. This is still somewhat
  incomplete and should be extendend in the future.

Additionally a lot of refactoring has been done and some unnecessary
code has been eliminated. Due to the increased set of jobs and my
ideas of convenience however, the code size has grown overall.
I've tried document the individual parts and would be happy about
feedback in general.

One future improvement could be making adding top-level haskell packages
more convenient and adding them all to the aggregate job automatically.
2021-05-03 11:40:03 +02:00
(cdep)illabout
d48f259ec7
CODEOWNERS: make sure all Haskell files are present 2021-05-03 15:14:49 +09:00
Malte Brandy
95908a23cb
CODEOWNERS: Haskell files. Add maralorn, declutter 2021-05-02 14:50:37 +02:00
sternenseemann
111151c4bc labeler: tag haskell tests as topic: haskell 2021-05-01 22:58:35 +02:00
sternenseemann
598adfc53c CODEOWNERS: notify for haskell specific tests 2021-05-01 22:58:35 +02:00
Domen Kožar
77215825de
editorconfig check: avoid channels as they might break one day 2021-04-29 10:14:40 +02:00
Domen Kožar
433df32ddb
editorconfig check: instruct user what to do 2021-04-29 10:14:40 +02:00
zowoq
5ba2e4e9c6 .github/workflows/editorconfig.yml: switch to pull_request_target
- use pull_request_target to avoid having to manually approve the action
- use nixpkgs editorconfig-checker rather than external binary
2021-04-28 23:40:50 +10:00
Graham Christensen
d6ed686eb2
Add NixOS/Security as a reviewer for .github/workflows 2021-04-24 13:21:42 -04:00
Graham Christensen
9d95ba3dd6 actions: add some permission restrictions 2021-04-24 13:07:57 -04:00
Domen Kožar
436161a2b8
Update .github/workflows/direct-push.yml
Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2021-04-21 10:26:59 +02:00