Commit Graph

320 Commits

Author SHA1 Message Date
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
Peter Simons
430a043a18 CODEOWNERS: update the list of maintainers of the R packages
See https://github.com/NixOS/nixpkgs/pull/93883 for further details.
2021-08-23 09:30:48 +02:00
Las Safin
629f88f3af
PULL_REQUEST_TEMPLATE.md: Improve platform checkboxes
1) Building with the sandbox enabled is the standard on Linux,
   so it is of little relevance with distribution they are using.
   Because of this, we now specify "Linux" instead of "NixOS",
   and the sandbox checkbox specifies "non-Linux".
2) aarch64 is a much more common platform, so we add two separate
   checkboxes for both aarch64-linux and aarch64-darwin.
3) The platform names now match what is actually used by Nix.
2021-08-19 13:01:59 +00:00
Kid
af74d97e9b
doc: fix typo and wording in pull request template 2021-08-05 22:45:09 +08:00
Eelco Dolstra
f2735b1d33 .github/labeler.yml: Label nixos-rebuild changes 2021-07-28 17:20:56 +02: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
Ryan Mulligan
05b7d71544 CODEOWNERS: remove ryantm from /nixos/doc 2021-07-25 05:50:28 -07: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
Kreyren
055926dc48
github/bug_report: Improve readability 2021-07-23 03:57:56 +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
9ea790e2f0
Merge pull request #129427 from NixOS/gha-tarball
GHA: add basic eval checks
2021-07-14 09:10:09 +02:00
Domen Kožar
7904fffeef
GHA: add basic eval checks 2021-07-07 14:26:59 +02:00
slotThe
2c529c3cb8 Link to Libera, Matrix instead of Freenode
The project has moved away from Freenode as an IRC network[1], and there
is now a quite large channel on Libera.  As such, we should point users
towards that instead.

This also changes all examples to refer to libera instead of freenode
as, with the recent deletion of all freenode channels, it is perhaps
where most communities are to be found nowadays.

Finally, also link to the official Matrix room[2] as an alternative to
IRC.

Related: https://github.com/NixOS/nixpkgs/pull/129384

[1]: https://discourse.nixos.org/t/join-us-on-matrix-at-nix-nixos-org-migrating-from-freenode
[2]: https://github.com/NixOS/rfcs/pull/94
2021-07-06 16:35:37 +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
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