about summary refs log tree commit diff
path: root/.github
AgeCommit message (Collapse)AuthorFilesLines
2021-07-01workflows: fix documentation for periodic 24 hours mergeDennis Gosnell1-1/+1
2021-07-01.github/workflows/periodic-merge-*: Tiny improvementsMalte Brandy2-3/+3
2021-06-30.github/workflows/periodic-merge: generalize from merge-stagingMartin Weinelt3-41/+104
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-26CONTRIBUTING.md: Move to repo root, where it is more visible.Niklas Hambüchen3-88/+3
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-26backporting action: Link to backporting criteria.Niklas Hambüchen1-2/+8
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-23doc: cleanup documentation relating to release notesRyan Mulligan2-1/+3
Also delete empty release notes file.
2021-06-19Merge pull request #126826 from domenkozar/direct-push-eventually-consistentDomen Kožar1-0/+3
direct-push action: delay to workaround eventually consistent DB
2021-06-19Merge pull request #126825 from domenkozar/backport-label-checkDomen Kožar1-1/+1
backport action: run only when the label starts with 'backport'
2021-06-16CODEOWNERS: add expipiplus1 for Haskell filesJoe Hermaszewski1-7/+7
2021-06-14direct-push action: delay to workaround eventually consistent DBDomen Kožar1-0/+3
2021-06-14backport action: run only when the label starts with 'backport'Domen Kožar1-1/+1
2021-06-09.github/workflows/rebase.yml: removezowoq1-134/+0
It only works sometimes and we're unable to fix it.
2021-06-09Merge pull request #126191 from etu/php-extensions-metaElis Hirwing1-6/+6
php: Improve extensions meta and codeowner data
2021-06-09doc/manual: Add backport criteriaJonathan Ringer1-1/+2
2021-06-09.github/CONTRIBUTING.md: Add backport release criteriaJonathan Ringer1-0/+8
2021-06-08codeowners: Add all @NixOS/php team members to codeowners listElis Hirwing1-6/+6
2021-06-06codeowners: add jtojnar to phpJan Tojnar1-2/+2
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-05pull_request_template: fix link to CONTRIBUTING.mdPavol Rusnak1-1/+1
2021-06-02pull_request_template: Add release note criteriaJonathan Ringer1-1/+4
2021-06-02.github/CONTRIBUTING.md: Add 21.11 release-notes stepsJonathan Ringer1-0/+10
2021-06-02.github/workflows/nixos-manual.yml: add permisssions so action runs don't ↵Ryan Mulligan1-1/+6
require approval
2021-05-28backport: trigger also if label is set after the mergeDomen Kožar1-1/+1
2021-05-28backport: set correct permissionsDomen Kožar1-2/+3
2021-05-28buildPythonPackage: add support for condaDavHau1-6/+8
2021-05-28.github/workflows/merge-staging.yml: change condition to `repository_owner`zowoq1-1/+1
This is consistent with the other actions.
2021-05-28.github/workflows/manual-{nixos,nixpkgs}.yml: add `repository_owner` conditionzowoq2-0/+2
We have this set in the other actions, it prevents the action from running in PRs made against forks.
2021-05-26.github/workflows/rebase.yml: update for 21.05Martin Weinelt1-1/+1
Adds three more valid branches to the rebase action.
2021-05-25Merge pull request #124273 from NixOS/backporting-actionDomen Kožar1-0/+22
Add backporting action
2021-05-25backport action: comment to keep pin in syncDomen Kožar1-0/+2
2021-05-25Update .github/workflows/backport.ymlDomen Kožar1-1/+1
Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2021-05-25Update .github/workflows/backport.ymlDomen Kožar1-1/+1
Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>
2021-05-25.github/workflows/nixos-manual.yml: add repository_owner conditionzowoq1-0/+1
We have this set in the other actions, it prevents the action from running in PRs made against forks.
2021-05-24Merge pull request #124266 from andir/codeownersAndreas Rammhold1-2/+1
CODEOWNERS: merge the neovim lines as they are not additive
2021-05-24Add backporting actionDomen Kožar1-0/+20
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-24CODEOWNERS: merge the neovim lines as they are not additiveAndreas Rammhold1-2/+1
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-22CODEOWNERS: add ryantm to /nixos/docRyan Mulligan1-0/+1
2021-05-22nixos/doc: add md-to-db.sh, convert "Building Your Own NixOS CD" to CommonMarkRyan Mulligan1-0/+20
2021-05-21pull request template: cleanup (#117537)Léo Gaspard1-2/+1
Remove elements of the PR template that have a low signal/noise ratio, and add one that I think would have a good signal/noise ratio. ----- Remove: Determined the impact on package closure size (by running `nix path-info -S` before and after) ----- Rationale: This is rarely done in practice, and apart from for specific packages this is usually not a good indicator of anything useful It might make sense to re-introduce it with two holes to fill, but then we would have to make a serious decision to never land without these two numbers filled in or with too big a regression, because in practice this box has been a no-op in many cases. Maybe just integrating this check in nixpkgs-review would bring the most benefit here? ----- ----- Remove: Ensured that relevant documentation is up to date ----- Rationale: This is fuzzy, “relevant documentation” is way too often hard to find ----- ----- Add: Added a release notes entry if the change is major or breaking ----- Rationale: This is way too often forgotten, and is also a self-contained easy task -----
2021-05-13.github/workflows/merge-staging.yml: Include branch in commentJan Tojnar1-1/+3
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-12.github/labeler.yml: Update GNOME file patternsJan Tojnar1-5/+5
This got missed in the move (https://github.com/NixOS/nixpkgs/pull/122107) because it is in a “hidden” directory.
2021-05-03pkgs/top-level: init expression for haskell-updates jobsetsternenseemann2-0/+2
release-haskell.nix is intended to be a replacement for https://github.com/peti/ci/blob/master/haskell-nixpkgs.nix which is currently the main expression for the haskell-updates jobset on hydra (in the nixpkgs project). It has the same jobs as the old haskell-nixpkgs.nix file: * haskellPackages.* * haskell.compiler.* * Some extra haskell packages for certain compilers The following jobs are new: * tests.haskell.* * A manually maintained list of top-level haskell packages (most of them using justStaticExecutables) * An aggregate job which is intended to aid merging the haskell-updates branch: It holds an arbitrary list of haskell-related packages and tests we intend have working at all times. This is still somewhat incomplete and should be extendend in the future. Additionally a lot of refactoring has been done and some unnecessary code has been eliminated. Due to the increased set of jobs and my ideas of convenience however, the code size has grown overall. I've tried document the individual parts and would be happy about feedback in general. One future improvement could be making adding top-level haskell packages more convenient and adding them all to the aggregate job automatically.
2021-05-03CODEOWNERS: make sure all Haskell files are present(cdep)illabout2-4/+8
2021-05-02CODEOWNERS: Haskell files. Add maralorn, declutterMalte Brandy1-6/+3
2021-05-01labeler: tag haskell tests as topic: haskellsternenseemann1-0/+1
2021-05-01CODEOWNERS: notify for haskell specific testssternenseemann1-0/+1
2021-04-29editorconfig check: avoid channels as they might break one dayDomen Kožar1-5/+6
2021-04-29editorconfig check: instruct user what to doDomen Kožar1-0/+4
2021-04-28.github/workflows/editorconfig.yml: switch to pull_request_targetzowoq1-9/+13
- use pull_request_target to avoid having to manually approve the action - use nixpkgs editorconfig-checker rather than external binary
2021-04-24Add NixOS/Security as a reviewer for .github/workflowsGraham Christensen1-1/+1
2021-04-24actions: add some permission restrictionsGraham Christensen3-0/+8
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-10-01 04:22:29 +0000