Commit Graph

682 Commits

Author SHA1 Message Date
Benjamin Hipple
ebee2aa0d4 Link to meta.changelog in PR description
We now have the bot:

1. Doing the automated upgrade (bump version, src, recomputing hash)
2. Doing a full nixpkgs-review reverse closure rebuild

The next step for a human is to review the upstream changelog. Right now they
have to find it manually, but if `meta.changelog` is set, this commit adds a
link to it directly in the PR description .

Resolves #44
2020-05-10 19:58:57 -04:00
Ryan Mulligan
ad876f8e7c temporarily disable redirectedUrl 2020-05-06 08:22:48 -07:00
Ryan Mulligan
aa94d8ef79
Merge pull request #197 from Synthetica9/homepage-rewriter2
Fix for redirectedUrls
2020-05-06 08:02:24 -07:00
Patrick Hilhorst
f4ddc50432
Re-enable redirectedUrl rewriter 2020-05-04 10:28:25 +02:00
Patrick Hilhorst
9a6657b27b
Correctly strip quotes in redirectedUrls
Fixes #195
2020-05-03 19:23:22 +02:00
Ryan Mulligan
8726aa5b2a
Merge pull request #196 from bhipple/fix/pr-description
Hide section about NixPkgs review when it was skipped
2020-05-03 09:56:17 -07:00
Benjamin Hipple
7f312dc1ff Hide section about NixPkgs review when it was skipped
We're no longer running this on `staging` PRs, and users doing single-package
updates have the option to omit `nixpkgs-review`, so we should only include the
PR comment section if it was actually run.

This continues to enhance the automated tests for the PR comment formatting,
so you can see what the diff looks like just by looking at the test suite!
2020-05-03 12:05:21 -04:00
Ryan Mulligan
a486177e21 fix temporarily disabling redirectedUrl rewriter 2020-05-03 08:20:11 -07:00
Ryan Mulligan
93d16eb853 temporarily disable redirectedUrl rewriter 2020-05-03 08:17:05 -07:00
Ryan Mulligan
aa41156b2a fix warnings 2020-05-03 07:57:58 -07:00
Ryan Mulligan
06b9fa94a6 skip nixpkgs-review for staging PRs 2020-05-03 07:56:31 -07:00
Ryan Mulligan
1b547c960d update cabal file with new http dependencies 2020-05-03 07:56:11 -07:00
Ryan Mulligan
bc4cd30714
Merge pull request #193 from bhipple/fix/issues
Fix several bugs with single-package updates
2020-05-03 07:50:35 -07:00
Patrick Hilhorst
d36029f84d
Add redirectedUrls rewriter (#194)
* Add redirectedUrls rewriter

* Rewrite runAll

* Formatting change

* Make the tests pass
2020-05-03 07:48:18 -07:00
Benjamin Hipple
0feb0e7051 Fix several bugs with single-package updates
1. We should always use `~/.cache/nixpkgs`, since if we do it in PWD the hard
resets risk blowing away user work!

2. Previously, we weren't fetching and resetting to up-to-date master, which
   meant cmds would fail if your nixpkgs checkout was stale.

3. Previously, we were ignoring the `--pr` option entirely. This fixes that bug
by passing the bool into the UpdateEnv, and also cleans up the selected options
in the logger so it's easier to see.

4. We were including the title PR twice, like this:
   https://github.com/NixOS/nixpkgs/pull/86624

There are still some issues and things to improve, but with this PR I've managed
to get a working usage here:
https://github.com/NixOS/nixpkgs/pull/86625
2020-05-03 00:30:22 -04:00
Ryan Mulligan
319a591676
Merge pull request #190 from bhipple/fix/pr-title
Trim newlines in GitHub PR titles
2020-05-02 12:52:56 -07:00
Benjamin Hipple
0b0beeca4d Trim newlines GitHub PR titles
The `interpolate` cmd by default is putting a trailing newline on this, as the
test case shows, so add an explicit `strip` to it.

Fixes #189
2020-05-02 14:21:43 -04:00
Benjamin Hipple
9065a0813f
Merge pull request #188 from bhipple/dev/pr-descr-tests
Refactoring PR description helper and starting to add tests
2020-05-02 13:54:22 -04:00
Jan Tojnar
639f5007cf
Blacklist: remove GNOME again
since the main update happened
2020-04-30 02:07:50 +02:00
Benjamin Hipple
286f040859 Refactoring PR description helper and starting to add tests
Having the tests makes it easier to visualize what's going on, because we can
just look at the test output data. This is not foolproof, since one of the IO
helper functions could generate bad data to pass to the pure helper, but it's
better than nothing.

This refactors as much as possible to keep the PR description logic in the pure
`prComment` function, rather than computing it in multiple places, which also
increases out unit test coverage.
2020-04-22 23:46:17 -04:00
Benjamin Hipple
517d4a5675
Merge pull request #187 from nh2/better-styling
Better styling of github posts for improved readabilty
2020-04-22 23:31:52 -04:00
Niklas Hambüchen
9d6f6266b7 Better styling of github posts for improved readabilty 2020-04-15 16:48:32 +02:00
Ryan Mulligan
d3690e0f69 switch to using GitHub library for PRs
unfortunately, this breaks PRs for single updates so removing that
feature advertisement for now.
2020-04-14 21:54:59 -07:00
Ryan Mulligan
ed230936ac attempt to debug why PR messages are being cut off 2020-04-14 21:18:45 -07:00
Ryan Mulligan
868f3f7555 use correct flag for hub file param 2020-04-14 19:41:26 -07:00
Ryan Mulligan
5026c4c719 write pr message to file for hub
we exceeded the limit of the command line length, so we need to use a
file now.
2020-04-14 08:39:38 -07:00
Ryan Mulligan
9f7b4fd25b fix other logic errors with doPR 2020-04-13 22:22:13 -07:00
Ryan Mulligan
a39fe36a74 Git.push fix bug with --dry-run 2020-04-13 22:09:28 -07:00
Ryan Mulligan
b8840ce550 stop relying on lib.inNixShell
developPackage will use this to determine if it should return a shell
env but instead lets be declarative aout this.
2020-04-13 21:08:00 -07:00
Ryan Mulligan
2f952bbbb3
Merge pull request #186 from ryantm/nixpkgsreview
optionally run nixpkgs-review
2020-04-13 20:39:28 -07:00
Ryan Mulligan
36f251fd73 optionally run nixpkgs-review 2020-04-13 19:33:21 -07:00
Ryan Mulligan
3d91562a8a
Merge pull request #185 from ryantm/python
increase python max package rebuilds from 10 to 25
2020-04-11 11:16:19 -07:00
Ryan Mulligan
e4968ed9f5 do commit cabal file, simplify development instructions
* it isn't necessary to run cabal2nix directly (developPackage) takes
care of that.
* the cabal file is committed, so it only needs to be updated when
adding dependencies or new files
2020-04-10 20:44:24 -07:00
Ryan Mulligan
39cd69ae64 increase python max package rebuilds from 10 to 25 2020-04-10 20:36:05 -07:00
Ryan Mulligan
4124bcb13f use master instead of latest 2020-04-10 20:33:48 -07:00
Ryan Mulligan
4c64c51aa1 add other installation methods 2020-04-06 22:15:46 -07:00
Ryan Mulligan
57da929cfc make README sections for update and update-list 2020-04-06 21:56:57 -07:00
Ryan Mulligan
1e94e7a5bc fix RewriteSpec options 2020-04-06 21:02:59 -07:00
Ryan Mulligan
8fd2aed8bf hide CVE reporting behind flag
closes #183
2020-04-06 20:39:27 -07:00
Ryan Mulligan
a1e0ec5970 fix ghcid instructions for exe/app 2020-04-06 20:38:46 -07:00
Ryan Mulligan
8632d0381e remove optional 4th parameter to UPDATE_INFO in basic instructions 2020-04-06 18:25:32 -07:00
Ryan Mulligan
c4ba666529 add instructions for basic single update usage 2020-04-06 17:53:34 -07:00
Ryan Mulligan
118cd4adf9 use current directory for nixpkgs if path ends in nixpgks
move reset to master into updateBatch instead of publishPackage so
there is no reset to master in the single update case
2020-04-06 17:48:20 -07:00
Ryan Mulligan
d2dcee918d
Merge pull request #181 from ryantm/ux
improve ux for single update case
2020-04-06 17:17:21 -07:00
Ryan Mulligan
7b79080366 explain trusted-users for cachix, allow other substitutors 2020-04-06 17:16:19 -07:00
Ryan Mulligan
d320593ccb move rewriter calls to Rewrite module 2020-04-05 21:27:39 -07:00
Ryan Mulligan
06a9f32830 separate update logic for single-package interactive updating case 2020-04-05 21:21:07 -07:00
Ryan Mulligan
b30faed1b1 improve ux for single update case
* instead of --dry-run use --pr to indicate a PR is wanted
* instead of additional updates, have update take the update as an
argument
* print out stdout instead of log file in the case of non-batch
updates
* print PR message to log even in the case of no PR
2020-04-05 18:04:38 -07:00
Ryan Mulligan
7f6a38ec92 add instructions for using ghcid with app and tests 2020-04-05 16:42:37 -07:00
Ryan Mulligan
abd0ebcf2e change master to latest
this way we can only deploy to latest when cachix is already populated
2020-04-05 16:15:46 -07:00