Unverified Commit 4e73fc3d authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

release: block on `aarch64` on `*-darwin` channels (#262038)

parents 37c3c1a3 1fa9b80b

pkgs/top-level/release.nix

+91 −45
Original line number Diff line number Diff line
@@ -87,12 +87,14 @@ let 
      lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };

      pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };



      darwin-tested = if supportDarwin.x86_64 then pkgs.releaseTools.aggregate

      darwin-tested = if supportDarwin.x86_64 || supportDarwin.aarch64 then pkgs.releaseTools.aggregate

        { name = "nixpkgs-darwin-${jobs.tarball.version}";

          meta.description = "Release-critical builds for the Nixpkgs darwin channel";

          constituents =

            [ jobs.tarball

          constituents = [

            jobs.tarball

            jobs.release-checks

          ]

          ++ optionals supportDarwin.x86_64 [

            jobs.cabal2nix.x86_64-darwin

            jobs.ghc.x86_64-darwin

            jobs.git.x86_64-darwin
@@ -135,6 +137,50 @@ let 
            jobs.tests.macOSSierraShared.x86_64-darwin

            jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin

            */

          ]

          ++ optionals supportDarwin.aarch64 [

            jobs.cabal2nix.aarch64-darwin

            jobs.ghc.aarch64-darwin

            jobs.git.aarch64-darwin

            jobs.go.aarch64-darwin

            jobs.mariadb.aarch64-darwin

            jobs.nix.aarch64-darwin

            jobs.nixpkgs-review.aarch64-darwin

            jobs.nix-info.aarch64-darwin

            jobs.nix-info-tested.aarch64-darwin

            jobs.openssh.aarch64-darwin

            jobs.openssl.aarch64-darwin

            jobs.pandoc.aarch64-darwin

            jobs.postgresql.aarch64-darwin

            jobs.python3.aarch64-darwin

            jobs.ruby.aarch64-darwin

            jobs.rustc.aarch64-darwin

            # blocking ofBorg CI 2020-02-28

            # jobs.stack.aarch64-darwin

            jobs.stdenv.aarch64-darwin

            jobs.vim.aarch64-darwin

            jobs.cachix.aarch64-darwin

            jobs.darwin.linux-builder.aarch64-darwin



            # UI apps

            # jobs.firefox-unwrapped.aarch64-darwin

            jobs.qt5.qtmultimedia.aarch64-darwin

            jobs.inkscape.aarch64-darwin

            jobs.gimp.aarch64-darwin

            jobs.emacs.aarch64-darwin

            jobs.wireshark.aarch64-darwin

            jobs.transmission_3-gtk.aarch64-darwin

            jobs.transmission_4-gtk.aarch64-darwin



            # Tests

            /*

            jobs.tests.cc-wrapper.default.aarch64-darwin

            jobs.tests.cc-wrapper.llvmPackages.clang.aarch64-darwin

            jobs.tests.cc-wrapper.llvmPackages.libcxx.aarch64-darwin

            jobs.tests.stdenv-inputs.aarch64-darwin

            jobs.tests.macOSSierraShared.aarch64-darwin

            jobs.tests.stdenv.hooks.patch-shebangs.aarch64-darwin

            */

          ];

        } else null;