diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-03-10 08:48:19 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-03-10 08:49:48 +0100 |
| commit | 76bea3f8bcd951ded88dfb7f8cad5bc3e5a1701f (patch) | |
| tree | 22968402c681697e3fd23e5988d5e79f64a9b1a5 /Makefile.am | |
| parent | 4399b1cf572b1e23ac80a7b7d63daee34a77e104 (diff) | |
ci: Remove hydra support.
This removes hydra support to use Cuirass as the only continuous integration
system.
* build-aux/hydra/gnu-system.scm: Remove it.
* build-aux/hydra/guix-modular.scm: Ditto.
* build-aux/hydra/guix.scm: Ditto.
* build-aux/cuirass/hydra-to-cuirass.scm: Ditto.
* Makefile.am (EXTRA_DIST): Update it.
(hydra-jobs.scm): Remove it.
(cuirass-jobs.scm): Update it.
* build-aux/hydra/evaluate.scm: Move it to ...
* build-aux/cuirass/evaluate.scm: ... here.
* build-aux/cuirass/guix-modular.scm: Remove it.
* build-aux/cuirass/gnu-system.scm: Ditto.
* guix/packages.scm (%hydra-supported-systems): Rename it to ...
(%cuirass-supported-systems): ... this variable.
* build-aux/check-final-inputs-self-contained: Adapt it.
* etc/release-manifest.scm: Ditto.
* gnu/ci.scm (package->alist): Remove it.
(derivation->job): New procedure.
(package-job, package-cross-job, cross-jobs, image-jobs, system-test-jobs,
tarball-jobs): Use it.
(guix-jobs): New procedure.
(hydra-jobs): Rename it to ...
(cuirass-jobs): ... this procedure.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index bb272970963..0f87c958f79 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -608,14 +608,7 @@ EXTRA_DIST += \ | |||
| 608 | etc/historical-authorizations \ | 608 | etc/historical-authorizations \ |
| 609 | build-aux/build-self.scm \ | 609 | build-aux/build-self.scm \ |
| 610 | build-aux/compile-all.scm \ | 610 | build-aux/compile-all.scm \ |
| 611 | build-aux/hydra/evaluate.scm \ | ||
| 612 | build-aux/hydra/gnu-system.scm \ | ||
| 613 | build-aux/hydra/guix.scm \ | ||
| 614 | build-aux/hydra/guix-modular.scm \ | ||
| 615 | build-aux/cuirass/gnu-system.scm \ | ||
| 616 | build-aux/cuirass/guix-modular.scm \ | ||
| 617 | build-aux/cuirass/hurd-manifest.scm \ | 611 | build-aux/cuirass/hurd-manifest.scm \ |
| 618 | build-aux/cuirass/hydra-to-cuirass.scm \ | ||
| 619 | build-aux/check-final-inputs-self-contained.scm \ | 612 | build-aux/check-final-inputs-self-contained.scm \ |
| 620 | build-aux/check-channel-news.scm \ | 613 | build-aux/check-channel-news.scm \ |
| 621 | build-aux/compile-as-derivation.scm \ | 614 | build-aux/compile-as-derivation.scm \ |
| @@ -955,28 +948,18 @@ check-channel-news: $(GOBJECTS) | |||
| 955 | $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ | 948 | $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ |
| 956 | "$(top_srcdir)/build-aux/check-channel-news.scm" | 949 | "$(top_srcdir)/build-aux/check-channel-news.scm" |
| 957 | 950 | ||
| 958 | # Compute the Hydra jobs and write them in the target file. | 951 | # Compute the Cuirass jobs. |
| 959 | hydra-jobs.scm: $(GOBJECTS) | 952 | cuirass-jobs: $(GOBJECTS) |
| 960 | $(AM_V_at)$(MKDIR_P) "`dirname "$@"`" | 953 | rm -rf "$@" |
| 954 | $(AM_V_at)$(MKDIR_P) "$@" | ||
| 961 | $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)" \ | 955 | $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)" \ |
| 962 | "$(top_srcdir)/build-aux/hydra/evaluate.scm" \ | 956 | "$(top_srcdir)/build-aux/cuirass/evaluate.scm" "$@" |
| 963 | "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp" | ||
| 964 | $(AM_V_at)mv "$@.tmp" "$@" | ||
| 965 | |||
| 966 | # Compute the Cuirass jobs and write them in the target file. | ||
| 967 | cuirass-jobs.scm: $(GOBJECTS) | ||
| 968 | $(AM_V_at)$(MKDIR_P) "`dirname "$@"`" | ||
| 969 | $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)" \ | ||
| 970 | "$(top_srcdir)/build-aux/hydra/evaluate.scm" \ | ||
| 971 | "$(top_srcdir)/build-aux/cuirass/gnu-system.scm" \ | ||
| 972 | cuirass > "$@.tmp" | ||
| 973 | $(AM_V_at)mv "$@.tmp" "$@" | ||
| 974 | 957 | ||
| 975 | .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version | 958 | .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version |
| 976 | .PHONY: assert-no-store-file-names assert-binaries-available | 959 | .PHONY: assert-no-store-file-names assert-binaries-available |
| 977 | .PHONY: assert-final-inputs-self-contained check-channel-news | 960 | .PHONY: assert-final-inputs-self-contained check-channel-news |
| 978 | .PHONY: clean-go make-go as-derivation authenticate | 961 | .PHONY: clean-go make-go as-derivation authenticate |
| 979 | .PHONY: update-guix-package update-NEWS release | 962 | .PHONY: update-guix-package update-NEWS cuirass-jobs release |
| 980 | 963 | ||
| 981 | # Downloading up-to-date PO files. | 964 | # Downloading up-to-date PO files. |
| 982 | 965 | ||
