Commit Graph

59 Commits

Author SHA1 Message Date
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
zowoq
153fae45aa .github/workflows/editorconfig.yml: get-diff-action 3.1.0 -> 4.0.0 2020-10-13 09:07:23 +10:00
zowoq
4e71acfe00 Revert ".github/workflows: build NixOS/Nixpkgs manuals (#88488)"
This reverts commit b3d674549f.
2020-10-03 20:24:11 +10:00
zowoq
b3d674549f
.github/workflows: build NixOS/Nixpkgs manuals (#88488) 2020-10-02 14:46:49 +02:00
zowoq
d5fe18167d .github/workflows: re-add editorconfig 2020-08-28 21:16:57 +10:00
zowoq
64a2de1fc0 .github/workflow/pending-{set,clear}: switch to curl 2020-08-26 22:04:40 +10:00
zowoq
c5dc3692b8 .github/workflow/pending-{set,clear}: check hash 2020-08-26 12:24:22 +10:00
zowoq
b2b1d3da03 .github/workflows: pending-{set,clear} 2020-08-25 14:28:20 +10:00
zowoq
cde25fe625 .github/workflows: disable 2020-08-11 12:24:21 +10:00
dependabot[bot]
858f133442 build(deps): bump technote-space/get-diff-action from v2.0.3 to v3.0.0 2020-08-10 21:48:33 +10:00
zowoq
86c9e2c08e .github/workflows/editorconfig.yml: skip when diff is empty 2020-08-09 19:46:37 +10:00
zowoq
5ca7be3888 .github/workflows/wait-ofborg.yml: 360 -> 540 2020-08-07 13:29:23 +10:00
zowoq
2351189166 .github/workflows/*: minor fixes 2020-08-06 21:47:40 +10:00
zowoq
bcb7327a0a .github/workflows/editorconfig.yml: remove branch restriction 2020-08-05 07:32:12 +10:00
zowoq
6a7f761d73 .github/workflows/wait-ofborg.yml: double timeout if staging 2020-08-04 15:28:13 +10:00
zowoq
c1fce8f814 .github/workflows/editorconfig.yml: separate fetch and check steps 2020-08-04 00:35:50 +10:00
zowoq
e6b686daea .github/workflows/editorconfig.yml: full fetch 2020-08-03 18:08:30 +10:00
dependabot[bot]
72bacbee2d
build(deps): bump technote-space/get-diff-action from v2.0.2 to v2.0.3
Bumps [technote-space/get-diff-action](https://github.com/technote-space/get-diff-action) from v2.0.2 to v2.0.3.
- [Release notes](https://github.com/technote-space/get-diff-action/releases)
- [Changelog](https://github.com/technote-space/get-diff-action/blob/master/.releasegarc)
- [Commits](https://github.com/technote-space/get-diff-action/compare/v2.0.2...b1acdd3017ce344029e1ae6d2b7769c3758799fe)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-03 07:17:56 +00:00
zowoq
3c9bcd43e7 .github/workflows/editorconfig.yml: update to match wait-ofborg action 2020-08-02 18:34:55 +10:00
zowoq
b4716cf867 .github/workflows/editorconfig.yml: update 2020-08-02 18:34:55 +10:00
Jörg Thalheim
4681807395
Revert "temporary delete github actions"
This reverts commit 256dbf6980.

This did not solve the github action failures
2020-07-31 17:34:37 +01:00
Jörg Thalheim
256dbf6980
temporary delete github actions
We are currently seeing a lot of misterious github actions failures.
They might be linked to our github actions:

https://github.com/nixos/nixpkgs/actions
2020-07-31 17:30:04 +01:00
dependabot[bot]
aa0fa84e50
build(deps): bump technote-space/get-diff-action from v1.2.8 to v2.0.2
Bumps [technote-space/get-diff-action](https://github.com/technote-space/get-diff-action) from v1.2.8 to v2.0.2.
- [Release notes](https://github.com/technote-space/get-diff-action/releases)
- [Changelog](https://github.com/technote-space/get-diff-action/blob/master/.releasegarc)
- [Commits](https://github.com/technote-space/get-diff-action/compare/v1.2.8...8641dcd991ed365c2647f8ee3f31c39bc03f5312)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-31 05:37:56 +00:00
Jörg Thalheim
6dce0bb299
Revert "actions/editorconfig: disable until we can combine this with ofborg (#88608)"
This reverts commit 1ccf44204b.
2020-07-30 21:45:29 +01:00