Commit graph

4043 commits

Author SHA1 Message Date
Janne Heß 7e459e8c5a
Merge pull request #1250 from Mic92/fix-ssh-prefix
hydra: fix localhost detection when protocol prefix are used
2022-09-30 10:06:29 +02:00
Jörg Thalheim 940c0d7d97 fix deprecated chown syntax 2022-09-29 21:22:13 +02:00
Jörg Thalheim 94d19e1972 hydra: fix localhost detection when protocol prefix are used 2022-09-29 20:46:13 +02:00
Eelco Dolstra a8876a8956
Merge pull request #1249 from Mic92/docs
docs/hacking: update nixos module option for nix-daemon
2022-09-28 17:02:49 +02:00
Jörg Thalheim 2ff67cbacc docs/hacking: update nixos module option for nix-daemon 2022-09-27 22:44:43 +02:00
Janne Heß 53335323ae
Merge pull request #1246 from Ma27/job-prometheus-metric-improvements
Job: expose `closuresize` and `size` (output size in the UI) as prometheus metrics
2022-09-22 16:21:42 +02:00
Maximilian Bosch d3fe4ffbf6
Job: expose closuresize and size (output size in the UI) as prometheus metrics 2022-09-22 10:47:22 +02:00
Graham Christensen d6cbf227cb
Merge pull request #1243 from K900/maybe-fix-trees
Run the JS code to make build trees collapsible at the right time
2022-09-08 09:55:14 -04:00
Janne Heß 4c67562c0a
Merge pull request #1237 from NixOS/update-nix
Update to Nix 2.11.0 and Nixpkgs 22.05
2022-09-08 12:08:48 +02:00
Eelco Dolstra 44e1efff7f Send the right nix-serve client version
We were using protocol version 6 but requesting version 4. The only
reason that this worked was because of a broken version check in
'nix-store --serve'. That was fixed in
c2d7456926,
which had the side-effect of breaking hydra-queue-runner.
2022-09-08 11:51:13 +02:00
Eelco Dolstra b16470c544 nix flake info -> nix flake metadata
This gets rid of a deprecation warning.
2022-09-06 19:23:20 +02:00
Eelco Dolstra 1dbc100837 flake.lock: Update
Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/b9cf655150b52d071c85a337cb5db96e735fa64a' (2022-07-11)
  → 'github:NixOS/nix/11e45768b34fdafdcf019ddbd337afa16127ff0f' (2022-08-27)
• Updated input 'nix/nixpkgs':
    'github:NixOS/nixpkgs/2fa57ed190fd6c7c746319444f34b5917666e5c1' (2022-05-31)
  → 'github:NixOS/nixpkgs/365e1b3a859281cf11b94f87231adeabbdd878a2' (2022-07-13)
2022-09-06 16:19:05 +02:00
Eelco Dolstra d61702f86d Merge remote-tracking branch 'origin/master' into update-nix 2022-09-06 16:14:23 +02:00
ajs124 222a8047e4
Merge pull request #1244 from NixOS/drop/hipchat
Drop the HipChat plugin
2022-08-20 19:33:22 +02:00
Janne Heß 81228cae50
Merge pull request #1239 from AmandaCameron/patch-3
Update hydra-module.nix to use newer nixos options
2022-08-20 19:25:46 +02:00
Janne Heß 371402c3c1
Drop the HipChat plugin
https://en.wikipedia.org/wiki/HipChat says:
> Following this, HipChat and Stride customers were migrated to the
> Slack group collaboration platform in a transition that was completed by
> February 2019.
2022-08-20 19:16:43 +02:00
Janne Heß 9addaeb17f
Add a squiggly line to the Hydra link on hover
The effect is the same as the one on links in mail bodys on
https://lists.apache.org/
2022-08-17 11:44:19 +02:00
Ilya K 2b8a8fdd9c Make the tree a little less dense 2022-08-12 09:46:32 +03:00
Ilya K 93bbd6925b Also restore the "expand all" and "collapse all" buttons 2022-08-12 09:46:17 +03:00
Ilya K 74caaa696e Run the JS code to make build trees collapsible at the right time 2022-08-11 13:30:19 +03:00
Janne Heß 2b1c1e65d5
Merge pull request #1242 from Ma27/fix-ldap-docs
doc/configuration: fix ldap role mapping example
2022-08-08 13:56:34 +02:00
Maximilian Bosch f6d45b0f0c
doc/configuration: fix ldap role mapping example
To group is called `cancel-build`, not `cancel-builds` (note the
trailing `s`).
2022-08-08 13:35:56 +02:00
Eelco Dolstra c511315b6b
Merge pull request #1240 from 2xsaiko/outgoing/download-mime
Use libmagic for better output MIME detection
2022-08-05 11:15:20 +02:00
Marco Rebhan a58e2f1a64
Use libmagic for better output MIME detection 2022-08-04 22:34:58 +02:00
Amanda Cameron 9656f16509
Update hydra-module.nix to use newer nixos options
nix.trustedUsers is deprecated as of 22.05, and since the nix.extraOptions config is just doing something similar, I moved that to the new nix.settings as well
2022-07-22 10:35:38 -04:00
Janne Heß e2756042b8
Merge pull request #965 from helsinki-systems/css_more_content
Fit more content on screen
2022-07-13 23:47:04 +02:00
Eelco Dolstra 481ca71d6e Use new flake output naming convention 2022-07-12 15:03:27 +02:00
Eelco Dolstra 3e001a8f05 Remove newNixpkgs and a lot of packages that are in Nixpkgs 22.05 2022-07-12 14:58:57 +02:00
Eelco Dolstra d5ba1bba50 Fix deprecation warning 2022-07-12 14:46:48 +02:00
Eelco Dolstra c72bed5cb4 Fix tests
Use $NIX_REMOTE instead of the legacy environment variables.
2022-07-12 14:45:30 +02:00
Eelco Dolstra e06c480fd6 flake.lock: Update
Flake lock file updates:

• Updated input 'newNixpkgs':
    'github:NixOS/nixpkgs/6e3ee8957637a60f5072e33d78e05c0f65c54366' (2022-03-15)
  → 'github:NixOS/nixpkgs/de5b3dd17034e6106e75746e81618e5bd408de8a' (2022-07-10)
• Updated input 'nix':
    'github:NixOS/nix/624e38aa43f304fbb78b4779172809add042b513' (2022-05-31)
  → 'github:NixOS/nix/b9cf655150b52d071c85a337cb5db96e735fa64a' (2022-07-11)
• Updated input 'nix/nixpkgs':
    'github:NixOS/nixpkgs/530a53dcbc9437363471167a5e4762c5fcfa34a1' (2022-02-19)
  → 'github:NixOS/nixpkgs/2fa57ed190fd6c7c746319444f34b5917666e5c1' (2022-05-31)
2022-07-12 14:45:30 +02:00
Eelco Dolstra 8dd1daac8a Update to Nix 2.10 2022-07-12 14:45:30 +02:00
Janne Heß 389ed2e110
Merge pull request #1235 from NixOS/drop/url-literal
Remove yet another URL literal
2022-07-12 10:23:07 +02:00
Janne Heß 38e033e7ce
Remove yet another URL literal 2022-07-10 13:31:21 +02:00
Janne Heß bf50ae0d36
Merge pull request #1224 from SuperSandro2000/dependabot/github_actions/actions/checkout-3
build(deps): bump actions/checkout from 2 to 3
2022-07-06 23:14:00 +02:00
Janne Heß d58bfe0909
Merge pull request #1199 from NixOS/dependabot/github_actions/cachix/install-nix-action-17
build(deps): bump cachix/install-nix-action from 16 to 17
2022-07-06 23:12:57 +02:00
Janne Heß e05118171b
Merge pull request #1229 from helsinki-systems/fix/nix-cat-store
replace nix cat-store with nix store cat
2022-07-01 13:28:27 +02:00
Janne Heß f2f82b3eee
Merge pull request #1230 from helsinki-systems/fix/declarative-dynamic-runcommand
AddBuilds: fix declarative jobsets with dynamic runcommand enabled
2022-06-30 17:25:09 +02:00
ajs124 bb1f04ed86 AddBuilds: fix declarative jobsets with dynamic runcommand enabled
$project->{enable_dynamic_run_command} is undefined
2022-06-30 01:49:30 +02:00
ajs124 bab671124d replace nix cat-store with nix store cat
the former was deprecated in favor of the latter
2022-06-30 00:24:09 +02:00
Janne Heß 44841fc827
Merge pull request #1223 from SuperSandro2000/patch-1
Remove url literal
2022-06-17 14:33:28 +02:00
Sandro 183f58ca9f
Remove url literal 2022-06-16 22:48:39 +02:00
Eelco Dolstra fb26435fe9
Merge pull request #1222 from Ma27/nix-2.9
flake: Update Nix to 2.9.1
2022-06-16 15:06:11 +02:00
Maximilian Bosch 5c01800fbe
flake: Update Nix to 2.9.1
NOTE: I'm well-aware that we have to be careful with this to avoid new
regressions on hydra.nixos.org, so this should only be merged after
extensive testing from more people.

Motivation: I updated Nix in my deployment to 2.9.1 and decided to also
update Hydra in one go (and compile it against the newer Nix). Given
that this also updates the C++ code in `hydra-{queue-runner,eval-jobs}`
this patch might become useful in the future though.
2022-06-16 14:54:57 +02:00
Janne Heß cf9f38e43f
Merge pull request #1211 from Ma27/fix-notifications-with-latest-git
Fix email notifications for jobsets w/git-inputs
2022-05-31 18:22:55 +02:00
Josef Kemetmüller b6ea85a601 scmdiff: Hardcode --git-dir
The newest version of git refuses to work on repositories not owned by
the current user. This leads to issues with the /api/scmdiff endpoint:

May 27 11:16:05 myhydra hydra-server[923698]: fatal: unsafe repository ('/var/lib/hydra/scm/git/57ea036ec7ecd85c8dd085e02ecc6f12dd5c079a6203d16aea49f586cadfb2be' is owned by someone else)
May 27 11:16:05 myhydra hydra-server[923698]: To add an exception for this directory, call:
May 27 11:16:05 myhydra hydra-server[923698]:         git config --global --add safe.directory /var/lib/hydra/scm/git/57ea036ec7ecd85c8dd085e02ecc6f12dd5c079a6203d16aea49f586cadfb2be
May 27 11:16:05 myhydra hydra-server[923701]: warning: Not a git repository. Use --no-index to compare two paths outside a working tree
May 27 11:16:05 myhydra hydra-server[923701]: usage: git diff --no-index [<options>] <path> <path>

I used the same solution that was used in NixOS/nix#6440.

Fixes #1214
2022-05-27 12:12:44 +02:00
Maximilian Bosch a8b590014b
Fix email notifications for jobsets w/git-inputs
I started to wonder quite recently why Hydra doesn't send email
notifications anymore to me. I saw the following issue in the log of
`hydra-notify.service`:

    May 22 11:57:29 hydra 9bik0bxyxbrklhx6lqwifd6af8kj84va-hydra-notify[1887289]: fatal: unsafe repository ('/var/lib/hydra/scm/git/3e70c16c266ef70dc4198705a688acccf71e932878f178277c9ac47d133cc663' is owned by someone else)
    May 22 11:57:29 hydra 9bik0bxyxbrklhx6lqwifd6af8kj84va-hydra-notify[1887289]: To add an exception for this directory, call:
    May 22 11:57:29 hydra 9bik0bxyxbrklhx6lqwifd6af8kj84va-hydra-notify[1887289]:         git config --global --add safe.directory /var/lib/hydra/scm/git/3e70c16c266ef70dc4198705a688acccf71e932878f178277c9ac47d133cc663
    May 22 11:57:29 hydra 9bik0bxyxbrklhx6lqwifd6af8kj84va-hydra-notify[1886654]: error running build_finished hooks: command `git log --pretty=format:%H%x09%an%x09%ae%x09%at b0c30a7557685d25a8ab3f34fdb775e66db0bc4c..eaf28389fcebc2beca13a802f79b2cca6e9ca309 --git-dir=.git' failed with e>

This is also a problem because of Git's fix for CVE-2022-24765[1], so I
applied the same fix as for Nix[2], by using `--git-dir` which skips the
code-path for the ownership-check[3].

[1] https://lore.kernel.org/git/xmqqv8veb5i6.fsf@gitster.g/
[2] https://github.com/NixOS/nix/pull/6440
[3] To quote `git(1)`:
    > Specifying the location of the ".git" directory using this option
    > (or GIT_DIR environment variable) turns off the repository
    > discovery that tries to find a directory with ".git" subdirectory
2022-05-22 14:14:14 +02:00
Janne Heß 27023b514a
Merge pull request #1210 from ulrikstrid/ulrikstrid-fix-github-pr
GithubPulls: Don't fail on missing `Link`
2022-05-18 17:48:50 +02:00
Ulrik Strid 3c71be5b5b GithubPulls: Don't fail on missing Link 2022-05-18 08:14:00 +02:00
Graham Christensen 7c133a98f8
Merge pull request #1203 from DeterminateSystems/ds-33/wait-child-on-eof
hydra-eval-jobs: Report forked worker process status information on exception
2022-05-02 15:35:12 -04:00