1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Commit graph

38 commits

Author SHA1 Message Date
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
zowoq e0742ab146 .github/workflows/wait-ofborg.yml: 260 -> 360 2020-07-29 11:38:18 +10:00
Jörg Thalheim 369f7dbc64
github-ci/ofborg: progress indicator 2020-07-28 15:06:32 +01:00
Jörg Thalheim 88c60d97fc
github-action/ofborg: only run in main repo 2020-07-28 14:52:09 +01:00
Jörg Thalheim 13f1c2386c
github-actions: increase timeout to wait for ofborg 2020-07-28 14:39:20 +01:00
Jörg Thalheim 4f95d1f259
add github action to wait for ofborg
In case ofborg is down this will not mark the CI as green.
Also if other github actions are used and pass
checks will be still marked as pending even if other other github
actions have passed.
2020-07-21 09:39:38 +01:00
Jörg Thalheim 1ccf44204b
actions/editorconfig: disable until we can combine this with ofborg (#88608)
We cannot run this check now, as it marks CI as green even though ofborg has not
evaluated it yet. In future we might be able to mark ofborg as a required test:
https://github.com/NixOS/nixpkgs/pull/87853#issuecomment-632676824
2020-05-22 13:15:13 +00:00
zowoq 05f9269602 editorconfig.yml: suppress curl output 2020-05-21 07:40:40 +10:00
zowoq 2f0c2d4c45 editorconfig.yml: switch to binary 2020-05-21 01:14:43 +10:00
zowoq a42190fc07 GitHub Actions: check editorconfig in PRs 2020-05-20 20:24:33 +10:00