Commit Graph

182 Commits

Author SHA1 Message Date
zowoq
d3270d6b32 .github/workflows/update-terraform-providers.yml: add nixpkgs-unstable for nix-shell
nix_path was removed from the update scripts in 3e63fa279f
2022-09-21 14:43:03 +10:00
zowoq
5fabd2ba5a .github/workflows/update-terraform-providers.yml: disable scheduled update
try nixpkgs-update with passthru.updateScript
2022-09-15 06:00:33 +10:00
zowoq
bbe49339b8 .github/workflows: fix permissions
the merge actions comment on pull requests, seems this was broken by 2c71278a23

also:
- fix permissions on new manual rendering action
- drop unnecessary issues permission from the terraform action
2022-09-12 15:34:35 +10:00
pennae
fc6f0ea188 workflows: fix manual-rendering.yml
the check command didn't set NIX_PATH, so compare-manuals.sh (which is a nix-shell script) failed.
2022-09-11 13:14:44 +10:00
pennae
c45deeb2aa workflows: add check for docbook/md manual equality
we want to make sure that rendering the manual from markdown without
going through docbook produces (semantically) the same output as with
going through docbook. to ensure this we'll build the manual twice, run
each manual through html-tidy to generate a normalized form and diff
the normalized forms. we don't want to compare raw output because that
exposes us to a lot of whitespace we'd have to reproduce exactly in the
MD render.

this check may be relaxed even further in the future, but hopefully not
by much.
2022-09-10 18:23:13 +02:00
pennae
ec75c8efff workflows: check that nixos manual does not use docbook option docs
the nixos manual should not use docbook for module option documentation,
only markdown, to make future transition to a markdown-only world easier
and less painful. this check will ensure that all options
documentation (even plain text that would not be interpreted specially
by neither markdown nor docbook) is declared as being markdown.
2022-09-10 18:23:13 +02:00
zowoq
25b464c8b3
terraform-full: remove (#184649)
* terraform-full: remove

* .github/workflows/update-terraform-providers.yml: switch to terraform.full
2022-08-02 19:45:05 +02:00
Winter
3707cc5a0d
Revert "backport-action: 0.0.5 -> 0.0.8" 2022-07-24 23:30:11 -04:00
Winter
fee30801b2 backport-action: 0.0.5 -> 0.0.8 2022-07-24 13:20:39 -04:00
github-actions[bot]
33be3debd5 terraform-providers: update 2022-07-10 2022-07-10 16:20:44 +10:00
Varun Sharma
2c71278a23 ci: Add GitHub token permissions for workflows
Signed-off-by: Varun Sharma <varunsh@stepsecurity.io>
2022-07-08 10:53:38 -07:00
Robert Hensing
3a27c40463 workflows/nixos-manual: Add command to run to error message 2022-07-06 07:32:17 +02:00
Janne Heß
8befefd1a7
workflows: Remove 21.11 merges
Channel is EOL
2022-07-04 20:04:17 +02:00
nathannaveen
5deff9583c chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: nathannaveen <42319948+nathannaveen@users.noreply.github.com>
2022-07-04 01:09:50 +00:00
Janne Heß
e728029b30
workflows: Replace 21.05 with 22.05 2022-05-23 19:57:42 +02:00
dependabot[bot]
646ed065e5 build(deps): bump peter-evans/create-pull-request from 3 to 4
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3 to 4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3...v4)
2022-04-29 17:58:49 +10:00
zowoq
c19e9b776d .github/workflows/update-terraform-providers.yml: minor fixes
- simplify comment
- move `ofborg` command into block for clickable copying
2022-04-28 08:13:24 +10:00
dependabot[bot]
23e9e781e2 build(deps): bump cachix/install-nix-action from 16 to 17
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 16 to 17.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v16...v17)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-08 17:59:26 +10:00
Artturin
36c36411b8 .github/workflows/basic-eval.yml: only run if manually triggered
ofborg should have obsoleted this with https://github.com/NixOS/ofborg/pull/588#issuecomment-1078451552
https://github.com/NixOS/nixpkgs/pull/166599#issuecomment-1085069938

this is still useful to have around for act usage
2022-04-01 09:48:20 +03:00
Sandro
319145c9dc
Merge pull request #165397 from Mic92/create-or-update-comment 2022-03-27 12:12:23 +02:00
dependabot[bot]
1f161a57c2 build(deps): bump peter-evans/commit-comment from 1 to 2
Bumps [peter-evans/commit-comment](https://github.com/peter-evans/commit-comment) from 1 to 2.
- [Release notes](https://github.com/peter-evans/commit-comment/releases)
- [Commits](https://github.com/peter-evans/commit-comment/compare/v1...v2)

---
updated-dependencies:
- dependency-name: peter-evans/commit-comment
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-23 08:24:13 +01:00
dependabot[bot]
180dada3ed build(deps): bump peter-evans/create-or-update-comment from 1 to 2
Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 1 to 2.
- [Release notes](https://github.com/peter-evans/create-or-update-comment/releases)
- [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v1...v2)

---
updated-dependencies:
- dependency-name: peter-evans/create-or-update-comment
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-23 08:23:37 +01:00
Jörg Thalheim
92a720cbac ci: add warning to actions with writeable GITHUB_TOKEN
Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>
2022-03-21 08:54:42 +01:00
zowoq
1d41af9bc9 .github/workflows/basic-eval.yml: add cachix cache
Avoids rebuilding nix in every PR if it hasn't been build on hydra yet.
2022-03-14 08:12:25 +10:00
zowoq
65268fe99a .github/workflows: update cachix cache comment 2022-03-14 08:12:24 +10:00
Jörg Thalheim
a385dd1ae3
Merge pull request #162450 from Mic92/actions-labeler
build(deps): bump actions/labeler from 3 to 4
2022-03-02 04:57:15 +00:00
dependabot[bot]
3f2c2d0afa
build(deps): bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)
2022-03-02 05:13:13 +01:00
dependabot[bot]
e07220a5ad
build(deps): bump actions/labeler from 3 to 4
Bumps [actions/labeler](https://github.com/actions/labeler) from 3 to 4.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v3...v4)
2022-03-02 05:08:31 +01:00
zowoq
215002fb9f terraform-providers: update scripts
- add flag to skip building updated providers
- have the github action skip building providers so we don't need to handle build failures in the script
- remove outdated `vendor` flag, all providers use `buildGoModule`
2022-02-07 12:02:36 +10:00
zowoq
fc7fb0d528 .github/workflows/update-terraform-providers.yml: minor fixes
- change ofborg command into a comment
- use WIP label instead of draft so codeowner notification works
2022-01-04 18:18:48 +10:00
zowoq
bcd238a027 .github/workflows/update-terraform-providers.yml: init
weekly update of terraform providers which can also be run manually
2022-01-04 11:00:15 +10:00
zowoq
1b8f795c94 .github/workflows/editorconfig.yml: 2.3.5 -> 2.4.0 2021-12-16 21:43:53 +10:00
zowoq
c3338bcdc4 .github/workflows/editorconfig.yml: allow PRs to skip check
Intended for treewide reformatting PRs so we don't hit the API ratelimit.
2021-12-03 12:54:08 +10:00
zowoq
0d02ab2028 .github/workflows/editorconfig.yml: write changed files to disk
This avoids errors when exporting long lists to $GITHUB_ENV.

Co-authored-by: Moritz Hedtke <Moritz.Hedtke@t-online.de>
2021-12-02 09:11:21 +10:00
zowoq
34fa1ffbe4 Revert ".github/workflows/editorconfig.yml: Don't use GitHub API for PR diff."
This reverts commit 4db84ed126.

Causing CI errors.
2021-11-30 10:42:57 +10:00
Moritz Hedtke
4db84ed126 .github/workflows/editorconfig.yml: Don't use GitHub API for PR diff.
This caused ratelimits for large PRs (reformatting PRs)
2021-11-30 09:41:52 +10:00
Martin Weinelt
3eb5d85beb .github/workflows/periodic-merge: configure 21.11 release 2021-11-28 17:00:50 -08:00
dependabot[bot]
4985724c82 build(deps): bump cachix/install-nix-action from 15 to 16
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 15 to 16.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v15...v16)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-23 13:50:59 +01:00
dependabot[bot]
a3d17b38a1 build(deps): bump cachix/install-nix-action from 14 to 15
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 14 to 15.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v14...v15)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-13 06:16:14 +01:00
Domen Kožar
6954a396d1 Revert "build(deps): bump zeebe-io/backport-action from 0.0.5 to 0.0.6 (#140848)"
This reverts commit 50341b0cd8.

It breaks the backport action.
2021-10-31 11:42:05 -06:00
Domen Kožar
a8ac0dd944 Revert "backport-action: 0.0.6 -> 0.0.7"
This reverts commit 7e3ba3e88b.

It breaks the backport.
2021-10-31 11:42:04 -06:00
Domen Kožar
7e3ba3e88b backport-action: 0.0.6 -> 0.0.7 2021-10-29 13:30:51 -05:00
Jörg Thalheim
50341b0cd8
build(deps): bump zeebe-io/backport-action from 0.0.5 to 0.0.6 (#140848)
* build(deps): bump zeebe-io/backport-action from 0.0.5 to 0.0.6

Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action) from 0.0.5 to 0.0.6.
- [Release notes](https://github.com/zeebe-io/backport-action/releases)
- [Commits](https://github.com/zeebe-io/backport-action/compare/v0.0.5...v0.0.6)

---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update .github/workflows/backport.yml

* Update .github/workflows/backport.yml

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Domen Kožar <domen@enlambda.com>
2021-10-28 20:22:14 +01:00
Martin Weinelt
8b77d991b6 .github/workflows/periodic-merge: move stable merges to 24h cycle 2021-10-05 20:53:53 +02:00
dependabot[bot]
307690708a build(deps): bump cachix/install-nix-action from 13 to 14
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 13 to 14.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v13...v14)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-09 08:05:27 +02:00
dependabot[bot]
05a5144fa9 build(deps): bump devmasx/merge-branch from 1.3.1 to 1.4.0
Bumps [devmasx/merge-branch](https://github.com/devmasx/merge-branch) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/devmasx/merge-branch/releases)
- [Changelog](https://github.com/devmasx/merge-branch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/devmasx/merge-branch/compare/v1.3.1...1.4.0)

---
updated-dependencies:
- dependency-name: devmasx/merge-branch
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-02 07:08:00 +10:00
Jörg Thalheim
2f9cf506dd
build(deps): bump zeebe-io/backport-action (#131466)
* build(deps): bump zeebe-io/backport-action

Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action) from 2b994724142df0774855690db56bc6308fb99ffa to 0.0.5. This release includes the previously tagged commit.
- [Release notes](https://github.com/zeebe-io/backport-action/releases)
- [Commits](2b99472414...e5d4d7c39c)

---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2021-07-25 19:22:26 +01:00
dependabot[bot]
8ebf75b3c7 build(deps): bump cachix/cachix-action from 9 to 10
Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 9 to 10.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v9...v10)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-25 13:48:04 +02:00
Jonas Chevalier
b8297c00c9
ci: add no-channel check (#109543)
* ci: add no-channel check

* Update .github/workflows/no-channel.yml

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-07-21 08:22:37 +02:00
Domen Kožar
7904fffeef
GHA: add basic eval checks 2021-07-07 14:26:59 +02:00
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