mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-12 07:34:36 +00:00
Code Issues Wiki Activity
301044 commits 186 branches 125 tags 8.2 GiB
Commit graph

82 commits

Author SHA1 Message Date
Dennis Gosnell 4b16b8c76b
workflows: fix documentation for periodic 24 hours merge 2021-07-01 20:16:36 +09:00
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
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
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
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
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
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
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
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
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 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
Domen Kožar 932ffcd08d
Update .github/workflows/direct-push.yml 
Co-authored-by: Alyssa Ross <hi@alyssa.is>
 2021-04-19 14:06:54 +02:00
Domen Kožar c9911f91ae
Add a warning comment on commits that violate https://github.com/NixOS/nixpkgs/issues/118661 2021-04-19 13:51:19 +02:00
zowoq dd2f61d22d .github/workflows/manual-*.yml: update cachix / install-nix actions 2021-04-03 16:10:57 +10:00
zowoq 574c4a7468 .github/workflows/labels.yml: set event types 
opened, synchronize, reopened are the defaults for `pull_request_target`,
`edited` will trigger the label action if the PRs base branch is changed.
 2021-04-03 06:09:27 +10:00
zowoq b83b95e37f .github/workflows/editorconfig.yml: 2.3.1 -> 2.3.5 2021-03-30 05:43:39 +10:00
zowoq cce9a296bd .github/workflows/labels.yml: label PRs 2021-03-20 17:51:02 -07:00
zowoq fc3b385a4f .github/workflows/rebase.yml: rebase for multiple branches 
- Error if the commenter doesn't have write access or maintainers can't edit the PR branch.

- Close and comment on PR after rebase so that actions are run when it's reopened.
  This doesn't happen currently as we're using the default github token which isn't allowed to trigger other actions.

- Disallow unwanted rebases.
  e.g. invalid branches, redundant rebases or rebasing permanent branches onto permanent branches.
 2021-02-14 11:16:40 +10:00
zowoq ac98f9973f .github/workflows/pending-set.yml: failed -> pending 2021-01-29 22:09:27 -08:00
zowoq 084fc49bf3 .github/workflows/editorconfig.yml: 2.2.0 -> 2.3.1 2021-01-10 06:55:15 +10:00
zowoq 376b48b604 .github/workflows/manual-{nixos,nixpkgs}.yml: fix restrict eval 
needs an explicit NIX_PATH
 2021-01-03 16:38:04 +10:00
zowoq e6f00abb56 .github/workflows/rebase-staging.yml: commit -> comment 2021-01-03 10:00:07 +10:00
zowoq 9304aa0fd4 .github/workflows/rebase-staging.yml: add reaction to the comment that started the job 2021-01-03 09:48:43 +10:00
zowoq 84b57757ad .github/workflows: build NixOS/Nixpkgs manuals with PR ref, restrict-eval and sandbox 2021-01-03 09:41:42 +10:00
zowoq 32ee74c0c9 .github/workflows: add rebase-staging.yml 2020-12-29 08:44:47 +10:00
zowoq 3f73b92270 .github/workflows/editorconfig.yml: use api for list of changed files 
faster than doing a full clone and using git diff
 2020-12-28 17:48:26 +10:00
Frederik Rietdijk d24639b341 GH action: merge staging(-next): fix cron 
It went every minute past every 6th hour, which was too often.
Now it should go on the zeroth minute every 6th hour.
 2020-12-02 14:25:08 +01:00
Frederik Rietdijk 318f929047 GH Action: merge staging(-next): comment on failure 
Comment on the designated issue in case of a failure.

Whoever wants to help out resolving merge conflicts can simply follow
this issue.
 2020-11-29 13:19:51 +01:00
Frederik Rietdijk 24884e5aac GH Action: merge staging(-next) periodically 
Automate the merging of `master` -> `staging-next` -> `staging`.

Our main development branch is `master`. Large rebuilds go to `staging`.
Periodically, `staging` is merged into `staging-next` for stabilization.
When considered sufficiently stable, `staging-next` is merged into
`master`.

As changes arrive on these branches, it is important that they're all
updated regularly with eachothers changes. This commit automates that
part.
 2020-11-28 13:44:18 +01:00
zowoq 4b5c6c8a58 .github/workflows/editorconfig.yml: disable for release branches 2020-11-10 20:47:11 +10:00
zowoq 652195179a .github/workflows/editorconfig.yml: check indent_style 2020-11-10 20:47:11 +10:00
zowoq a920bf4308 .github/workflows/editorconfig.yml: 2.1.0 -> 2.2.0 2020-10-21 10:50:22 +10:00