Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/hydra
base: 082dbdb9222a
Choose a base ref
...
head repository: NixOS/hydra
compare: 53e1294825c3
Choose a head ref
  • 6 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 31, 2020

  1. Remove outdated email address 

    (cherry picked from commit 22a65d0)
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    8b5900a View commit details
    Browse the repository at this point in the history

  2. Remove tabs 

    (cherry picked from commit 5b73100)
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    68a59f3 View commit details
    Browse the repository at this point in the history

  3. Abort unsupported build steps 

    If we don't see machine that supports a build step for
'max_unsupported_time' seconds, the step is aborted. The default is 0,
which is appropriate for Hydra installations that don't provision
missing machines dynamically.

(cherry picked from commit f5cdbfe)
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    4417f9f View commit details
    Browse the repository at this point in the history

  4. Keep track of the number of unsupported steps 

    (cherry picked from commit 45ffe57)
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    ccd046c View commit details
    Browse the repository at this point in the history

  5. Don't spam the journal with hydra-queue-runner status dumps 

    (cherry picked from commit 15ae932)
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    9727892 View commit details
    Browse the repository at this point in the history

  6. Fix Mercurial tests 

    In Nixpkgs 20.03, Mercurial fails if PYTHONPATH is set:

  $ hg
  Traceback (most recent call last):
    File "/nix/store/q7s856v6nw4dffdrm9k3w38qs35i8kr3-mercurial-5.2.2/bin/..hg-wrapped-wrapped", line 37, in <module>
      dispatch.run()
    File "/nix/store/bffdy7q3wi3qinflnvbdkigqj39zzynd-python3-3.7.6/lib/python3.7/importlib/util.py", line 245, in __getattribute__
      self.__spec__.loader.exec_module(self)
    File "<frozen importlib._bootstrap_external>", line 728, in exec_module
    File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
    File "/nix/store/q7s856v6nw4dffdrm9k3w38qs35i8kr3-mercurial-5.2.2/lib/python3.7/site-packages/mercurial/dispatch.py", line 10, in <module>
      import difflib
    File "/nix/store/bffdy7q3wi3qinflnvbdkigqj39zzynd-python3-3.7.6/lib/python3.7/difflib.py", line 1084, in <module>
      import re
    File "/nix/store/bffdy7q3wi3qinflnvbdkigqj39zzynd-python3-3.7.6/lib/python3.7/re.py", line 143, in <module>
      class RegexFlag(enum.IntFlag):
  AttributeError: module 'enum' has no attribute 'IntFlag'

(cherry picked from commit 4009d42)
    @edolstra
    edolstra committed Mar 31, 2020
    Copy the full SHA
    53e1294 View commit details
    Browse the repository at this point in the history