Next round

79c6f886 · Sven Tennie · 59567e6c · 79c6f886 · 79c6f886 · 79c6f886
Commit 79c6f886 authored 7 months ago by Sven Tennie
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -509,30 +509,30 @@ stack-hadrian-build:
 # Testing ABI is invariant across builds
 ########################################

-abi-test-nightly:
-  stage: full-build
-  needs:
-    - job: nightly-x86_64-linux-fedora33-release-hackage
-    - job: nightly-x86_64-linux-fedora33-release
-  tags:
-    - x86_64-linux
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
-  dependencies: null
-  before_script:
-    - mkdir -p normal
-    - mkdir -p hackage
-    - tar -xf ghc-x86_64-linux-fedora33-release.tar.xz -C normal/
-    - tar -xf ghc-x86_64-linux-fedora33-release-hackage_docs.tar.xz -C hackage/
-  script:
-    - .gitlab/ci.sh compare_interfaces_of "normal/ghc-*" "hackage/ghc-*"
-  artifacts:
-    paths:
-      - out
-  rules:
-    # This job is broken. Disabling it until some kind soul can finish its
-    # implementation. #23269
-    - when: never
-    - if: $NIGHTLY
+# abi-test-nightly:
+#   stage: full-build
+#   needs:
+#     - job: nightly-x86_64-linux-fedora33-release-hackage
+#     - job: nightly-x86_64-linux-fedora33-release
+#   tags:
+#     - x86_64-linux
+#   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
+#   dependencies: null
+#   before_script:
+#     - mkdir -p normal
+#     - mkdir -p hackage
+#     - tar -xf ghc-x86_64-linux-fedora33-release.tar.xz -C normal/
+#     - tar -xf ghc-x86_64-linux-fedora33-release-hackage_docs.tar.xz -C hackage/
+#   script:
+#     - .gitlab/ci.sh compare_interfaces_of "normal/ghc-*" "hackage/ghc-*"
+#   artifacts:
+#     paths:
+#       - out
+#   rules:
+#     # This job is broken. Disabling it until some kind soul can finish its
+#     # implementation. #23269
+#     - when: never
+#     - if: $NIGHTLY

 ############################################################
 # Packaging
@@ -869,52 +869,52 @@ release-hackage-lint:

 # Triggering jobs in the ghc/test-primops project

-.test-primops:
-  stage: testing
-  variables:
-    UPSTREAM_PROJECT_PATH: "$CI_PROJECT_PATH"
-    UPSTREAM_PROJECT_ID: "$CI_PROJECT_ID"
-    UPSTREAM_PIPELINE_ID: "$CI_PIPELINE_ID"
-  trigger:
-    project: "ghc/test-primops"
-    branch: "upstream-testing"
-    strategy: "depend"
-
-.test-primops-validate-template:
-  needs:
-    - job: x86_64-linux-deb12-validate
-      artifacts: false
-    - job: aarch64-linux-deb12-validate
-      artifacts: false
-    - job: aarch64-darwin-validate
-      artifacts: false
-    - job: x86_64-darwin-validate
-      artifacts: false
-  extends: .test-primops
-
-test-primops-label:
-  extends: .test-primops-validate-template
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-primops.*/'
-
-test-primops-nightly:
-  extends: .test-primops
-  needs:
-    - job: nightly-x86_64-linux-deb12-validate
-      artifacts: false
-    - job: nightly-aarch64-linux-deb12-validate
-      artifacts: false
-    - job: nightly-aarch64-darwin-validate
-      artifacts: false
-    - job: nightly-x86_64-darwin-validate
-      artifacts: false
-  rules:
-    - if: $NIGHTLY
-
-test-primops-release:
-  extends: .test-primops
-  rules:
-    - if: '$RELEASE_JOB == "yes"'
+# .test-primops:
+#   stage: testing
+#   variables:
+#     UPSTREAM_PROJECT_PATH: "$CI_PROJECT_PATH"
+#     UPSTREAM_PROJECT_ID: "$CI_PROJECT_ID"
+#     UPSTREAM_PIPELINE_ID: "$CI_PIPELINE_ID"
+#   trigger:
+#     project: "ghc/test-primops"
+#     branch: "upstream-testing"
+#     strategy: "depend"
+#
+# .test-primops-validate-template:
+#   needs:
+#     - job: x86_64-linux-deb12-validate
+#       artifacts: false
+#     - job: aarch64-linux-deb12-validate
+#       artifacts: false
+#     - job: aarch64-darwin-validate
+#       artifacts: false
+#     - job: x86_64-darwin-validate
+#       artifacts: false
+#   extends: .test-primops
+#
+# test-primops-label:
+#   extends: .test-primops-validate-template
+#   rules:
+#     - if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-primops.*/'
+#
+# test-primops-nightly:
+#   extends: .test-primops
+#   needs:
+#     - job: nightly-x86_64-linux-deb12-validate
+#       artifacts: false
+#     - job: nightly-aarch64-linux-deb12-validate
+#       artifacts: false
+#     - job: nightly-aarch64-darwin-validate
+#       artifacts: false
+#     - job: nightly-x86_64-darwin-validate
+#       artifacts: false
+#   rules:
+#     - if: $NIGHTLY
+#
+# test-primops-release:
+#   extends: .test-primops
+#   rules:
+#     - if: '$RELEASE_JOB == "yes"'

 ############################################################
 # Nofib testing
@@ -1104,153 +1104,153 @@ project-version:
    paths:
      - version.sh

-.ghcup-metadata:
-  stage: deploy
-  image: nixos/nix:2.14.1
-  dependencies: null
-  tags:
-    - x86_64-linux
-  variables:
-    BUILD_FLAVOUR: default
-    GIT_SUBMODULE_STRATEGY: "none"
-  before_script:
-    - echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
-    # FIXME: See Note [Nix-in-Docker]
-    - nix-shell -p gnused --run "sed -i -e 's/nixbld//' /etc/nix/nix.conf"
-    - nix-channel --update
-    - cat version.sh
-    # Calculate the project version
-    - . ./version.sh
-
-    # Download existing ghcup metadata for the correct year
-    - PipelineYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)"
-    - nix shell nixpkgs#wget -c wget "https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-$PipelineYear-0.0.7.yaml" -O ghcup-0.0.7.yaml
-
-    - nix run .gitlab/generate-ci#generate-job-metadata
-
-  artifacts:
-    paths:
-      - metadata_test.yaml
-      - version.sh
-
-ghcup-metadata-nightly:
-  extends: .ghcup-metadata
-  # Explicit needs for validate pipeline because we only need certain bindists
-  needs:
-    - job: nightly-x86_64-linux-fedora33-release
-      artifacts: false
-    - job: nightly-x86_64-linux-centos7-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-ubuntu20_04-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-ubuntu18_04-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-rocky8-validate
-      artifacts: false
-    - job: nightly-x86_64-darwin-validate
-      artifacts: false
-    - job: nightly-aarch64-darwin-validate
-      artifacts: false
-    - job: nightly-x86_64-windows-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-alpine3_12-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-alpine3_20-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-deb9-validate
-      artifacts: false
-    - job: nightly-i386-linux-deb10-validate
-      artifacts: false
-    - job: nightly-i386-linux-deb12-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-deb10-validate
-      artifacts: false
-    - job: nightly-aarch64-linux-deb10-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-deb11-validate
-      artifacts: false
-    - job: nightly-x86_64-linux-deb12-validate
-      artifacts: false
-    - job: nightly-aarch64-linux-deb12-validate
-      artifacts: false
-    - job: nightly-aarch64-linux-alpine3_18-validate
-      artifacts: false
-    - job: source-tarball
-      artifacts: false
-    - job: project-version
-  script:
-    - nix shell --extra-experimental-features nix-command -f .gitlab/rel_eng -c ghcup-metadata --metadata ghcup-0.0.7.yaml --date="$(date -d $CI_PIPELINE_CREATED_AT +%Y-%m-%d)" --pipeline-id="$CI_PIPELINE_ID" --version="$ProjectVersion" > "metadata_test.yaml"
-  rules:
-    - if: $NIGHTLY
-
-# Update the ghcup metadata with information about this nightly pipeline
-ghcup-metadata-nightly-push:
-  stage: deploy
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
-  dependencies: null
-  tags:
-    - x86_64-linux
-  variables:
-    BUILD_FLAVOUR: default
-    GIT_SUBMODULE_STRATEGY: "none"
-  needs:
-    - job: ghcup-metadata-nightly
-      artifacts: true
-  script:
-    - git clone https://gitlab.haskell.org/ghc/ghcup-metadata.git
-    - PipelineYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)"
-    - cp metadata_test.yaml "ghcup-metadata/ghcup-nightlies-$PipelineYear-0.0.7.yaml"
-    - cp metadata_test.yaml "ghcup-metadata/ghcup-nightlies-0.0.7.yaml"
-    - cd ghcup-metadata
-    - git config user.email "ghc-ci@gitlab-haskell.org"
-    - git config user.name "GHC GitLab CI"
-    - git remote add gitlab_origin https://oauth2:$PROJECT_PUSH_TOKEN@gitlab.haskell.org/ghc/ghcup-metadata.git
-    - git add .
-    - git commit -m "Update metadata"
-    - git push gitlab_origin HEAD:updates
-  rules:
-    # Only run the update on scheduled nightly pipelines, ie once a day
-    - if: $NIGHTLY && $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "master"
-
-
-ghcup-metadata-release:
-  # No explicit needs for release pipeline as we assume we need everything and everything will pass.
-  extends: .ghcup-metadata
-  script:
-    - nix shell --extra-experimental-features nix-command -f .gitlab/rel_eng -c ghcup-metadata --release-mode --metadata ghcup-0.0.7.yaml --date="$(date -d $CI_PIPELINE_CREATED_AT +%Y-%m-%d)" --pipeline-id="$CI_PIPELINE_ID" --version="$ProjectVersion" > "metadata_test.yaml"
-  rules:
-    - if: '$RELEASE_JOB == "yes"'
-
-.ghcup-metadata-testing:
-  stage: deploy
-  variables:
-    UPSTREAM_PROJECT_PATH: "$CI_PROJECT_PATH"
-    UPSTREAM_PROJECT_ID: "$CI_PROJECT_ID"
-    UPSTREAM_PIPELINE_ID: "$CI_PIPELINE_ID"
-    RELEASE_JOB: "$RELEASE_JOB"
-  trigger:
-    project: "ghc/ghcup-ci"
-    branch: "upstream-testing"
-    strategy: "depend"
-
-ghcup-metadata-testing-nightly:
-  needs:
-    - job: ghcup-metadata-nightly
-      artifacts: false
-  extends: .ghcup-metadata-testing
-  variables:
-      NIGHTLY: "$NIGHTLY"
-      UPSTREAM_JOB_NAME: "ghcup-metadata-nightly"
-  rules:
-    - if: '$NIGHTLY == "1"'
-
-ghcup-metadata-testing-release:
-  needs:
-    - job: ghcup-metadata-release
-      artifacts: false
-  extends: .ghcup-metadata-testing
-  variables:
-      UPSTREAM_JOB_NAME: "ghcup-metadata-release"
-  rules:
-    - if: '$RELEASE_JOB == "yes"'
-  when: manual
+# .ghcup-metadata:
+#   stage: deploy
+#   image: nixos/nix:2.14.1
+#   dependencies: null
+#   tags:
+#     - x86_64-linux
+#   variables:
+#     BUILD_FLAVOUR: default
+#     GIT_SUBMODULE_STRATEGY: "none"
+#   before_script:
+#     - echo "experimental-features = nix-command flakes" >> /etc/nix/nix.conf
+#     # FIXME: See Note [Nix-in-Docker]
+#     - nix-shell -p gnused --run "sed -i -e 's/nixbld//' /etc/nix/nix.conf"
+#     - nix-channel --update
+#     - cat version.sh
+#     # Calculate the project version
+#     - . ./version.sh
+#
+#     # Download existing ghcup metadata for the correct year
+#     - PipelineYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)"
+#     - nix shell nixpkgs#wget -c wget "https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-$PipelineYear-0.0.7.yaml" -O ghcup-0.0.7.yaml
+#
+#     - nix run .gitlab/generate-ci#generate-job-metadata
+#
+#   artifacts:
+#     paths:
+#       - metadata_test.yaml
+#       - version.sh
+#
+# ghcup-metadata-nightly:
+#   extends: .ghcup-metadata
+#   # Explicit needs for validate pipeline because we only need certain bindists
+#   needs:
+#     - job: nightly-x86_64-linux-fedora33-release
+#       artifacts: false
+#     - job: nightly-x86_64-linux-centos7-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-ubuntu20_04-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-ubuntu18_04-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-rocky8-validate
+#       artifacts: false
+#     - job: nightly-x86_64-darwin-validate
+#       artifacts: false
+#     - job: nightly-aarch64-darwin-validate
+#       artifacts: false
+#     - job: nightly-x86_64-windows-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-alpine3_12-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-alpine3_20-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-deb9-validate
+#       artifacts: false
+#     - job: nightly-i386-linux-deb10-validate
+#       artifacts: false
+#     - job: nightly-i386-linux-deb12-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-deb10-validate
+#       artifacts: false
+#     - job: nightly-aarch64-linux-deb10-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-deb11-validate
+#       artifacts: false
+#     - job: nightly-x86_64-linux-deb12-validate
+#       artifacts: false
+#     - job: nightly-aarch64-linux-deb12-validate
+#       artifacts: false
+#     - job: nightly-aarch64-linux-alpine3_18-validate
+#       artifacts: false
+#     - job: source-tarball
+#       artifacts: false
+#     - job: project-version
+#   script:
+#     - nix shell --extra-experimental-features nix-command -f .gitlab/rel_eng -c ghcup-metadata --metadata ghcup-0.0.7.yaml --date="$(date -d $CI_PIPELINE_CREATED_AT +%Y-%m-%d)" --pipeline-id="$CI_PIPELINE_ID" --version="$ProjectVersion" > "metadata_test.yaml"
+#   rules:
+#     - if: $NIGHTLY
+#
+# # Update the ghcup metadata with information about this nightly pipeline
+# ghcup-metadata-nightly-push:
+#   stage: deploy
+#   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
+#   dependencies: null
+#   tags:
+#     - x86_64-linux
+#   variables:
+#     BUILD_FLAVOUR: default
+#     GIT_SUBMODULE_STRATEGY: "none"
+#   needs:
+#     - job: ghcup-metadata-nightly
+#       artifacts: true
+#   script:
+#     - git clone https://gitlab.haskell.org/ghc/ghcup-metadata.git
+#     - PipelineYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)"
+#     - cp metadata_test.yaml "ghcup-metadata/ghcup-nightlies-$PipelineYear-0.0.7.yaml"
+#     - cp metadata_test.yaml "ghcup-metadata/ghcup-nightlies-0.0.7.yaml"
+#     - cd ghcup-metadata
+#     - git config user.email "ghc-ci@gitlab-haskell.org"
+#     - git config user.name "GHC GitLab CI"
+#     - git remote add gitlab_origin https://oauth2:$PROJECT_PUSH_TOKEN@gitlab.haskell.org/ghc/ghcup-metadata.git
+#     - git add .
+#     - git commit -m "Update metadata"
+#     - git push gitlab_origin HEAD:updates
+#   rules:
+#     # Only run the update on scheduled nightly pipelines, ie once a day
+#     - if: $NIGHTLY && $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == "master"
+#
+#
+# ghcup-metadata-release:
+#   # No explicit needs for release pipeline as we assume we need everything and everything will pass.
+#   extends: .ghcup-metadata
+#   script:
+#     - nix shell --extra-experimental-features nix-command -f .gitlab/rel_eng -c ghcup-metadata --release-mode --metadata ghcup-0.0.7.yaml --date="$(date -d $CI_PIPELINE_CREATED_AT +%Y-%m-%d)" --pipeline-id="$CI_PIPELINE_ID" --version="$ProjectVersion" > "metadata_test.yaml"
+#   rules:
+#     - if: '$RELEASE_JOB == "yes"'
+#
+# .ghcup-metadata-testing:
+#   stage: deploy
+#   variables:
+#     UPSTREAM_PROJECT_PATH: "$CI_PROJECT_PATH"
+#     UPSTREAM_PROJECT_ID: "$CI_PROJECT_ID"
+#     UPSTREAM_PIPELINE_ID: "$CI_PIPELINE_ID"
+#     RELEASE_JOB: "$RELEASE_JOB"
+#   trigger:
+#     project: "ghc/ghcup-ci"
+#     branch: "upstream-testing"
+#     strategy: "depend"
+#
+# ghcup-metadata-testing-nightly:
+#   needs:
+#     - job: ghcup-metadata-nightly
+#       artifacts: false
+#   extends: .ghcup-metadata-testing
+#   variables:
+#       NIGHTLY: "$NIGHTLY"
+#       UPSTREAM_JOB_NAME: "ghcup-metadata-nightly"
+#   rules:
+#     - if: '$NIGHTLY == "1"'
+#
+# ghcup-metadata-testing-release:
+#   needs:
+#     - job: ghcup-metadata-release
+#       artifacts: false
+#   extends: .ghcup-metadata-testing
+#   variables:
+#       UPSTREAM_JOB_NAME: "ghcup-metadata-release"
+#   rules:
+#     - if: '$RELEASE_JOB == "yes"'
+#   when: manual
--- a/.gitlab/generate-ci/gen_ci.hs
+++ b/.gitlab/generate-ci/gen_ci.hs
@@ -1120,20 +1120,20 @@ alpine_aarch64 = [
 cross_jobs :: [JobGroup Job]
 cross_jobs = [
  -- x86 -> aarch64
-    validateBuilds Amd64 (Linux Debian11) (crossConfig "aarch64-linux-gnu" (Emulator "qemu-aarch64 -L /usr/aarch64-linux-gnu") Nothing)
+  --  validateBuilds Amd64 (Linux Debian11) (crossConfig "aarch64-linux-gnu" (Emulator "qemu-aarch64 -L /usr/aarch64-linux-gnu") Nothing)

    -- x86 -> aarch64
-  , validateBuilds Amd64 (Linux Debian12RiscvCross) (crossConfig "riscv64-linux-gnu" (Emulator "qemu-riscv64 -L /usr/riscv64-linux-gnu") Nothing)
+    validateBuilds Amd64 (Linux Debian12RiscvCross) (crossConfig "riscv64-linux-gnu" (Emulator "qemu-riscv64 -L /usr/riscv64-linux-gnu") Nothing)

  -- Javascript
-  , addValidateRule JSBackend (validateBuilds Amd64 (Linux Debian11Js) javascriptConfig)
-
-  -- Wasm
-  , make_wasm_jobs wasm_build_config
-  , modifyValidateJobs manual $
-      make_wasm_jobs wasm_build_config {bignumBackend = Native}
-  , modifyValidateJobs manual $
-      make_wasm_jobs wasm_build_config {unregisterised = True}
+  -- , addValidateRule JSBackend (validateBuilds Amd64 (Linux Debian11Js) javascriptConfig)
+
+  -- -- Wasm
+  -- , make_wasm_jobs wasm_build_config
+  -- , modifyValidateJobs manual $
+  --     make_wasm_jobs wasm_build_config {bignumBackend = Native}
+  -- , modifyValidateJobs manual $
+  --     make_wasm_jobs wasm_build_config {unregisterised = True}
  ]
  where
    javascriptConfig = (crossConfig "javascript-unknown-ghcjs" (Emulator "js-emulator") (Just "emconfigure"))
@@ -1156,18 +1156,18 @@ cross_jobs = [
        }

 job_groups :: [JobGroup Job]
-job_groups =
-     debian_x86
-  ++ debian_aarch64
-  ++ debian_i386
-  ++ fedora_x86
-  ++ windows_x86
-  ++ darwin
-  ++ ubuntu_x86
-  ++ rhel_x86
-  ++ alpine_x86
-  ++ alpine_aarch64
-  ++ cross_jobs
+job_groups = cross_jobs
+--     debian_x86
+--  ++ debian_aarch64
+--  ++ debian_i386
+--  ++ fedora_x86
+--  ++ windows_x86
+--  ++ darwin
+--  ++ ubuntu_x86
+--  ++ rhel_x86
+--  ++ alpine_x86
+--  ++ alpine_aarch64
+--  ++ cross_jobs


 mkPlatform :: Arch -> Opsys -> String

--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml