From 94eb63d31d28862becadfd68c38114f2e728b58e Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Fri, 8 Oct 2021 21:22:01 +0200
Subject: [PATCH] 3.4.1.0 gitlab CI fixes (#7728)
* Backport fix for darwin M1 to cabal.project.release
* Clean up dirty merge
* remove unnecessary flags from release project file
Co-authored-by: Emily Pillmore <emilypi@cohomolo.gy>
---
.gitlab/common.sh | 68 -------------------------------------------
cabal.project.release | 8 ++---
2 files changed, 3 insertions(+), 73 deletions(-)
diff --git a/.gitlab/common.sh b/.gitlab/common.sh
index 36d7ee5750..b6bce698c9 100644
--- a/.gitlab/common.sh
+++ b/.gitlab/common.sh
@@ -47,71 +47,3 @@ function run() {
info "Running $*..."
"$@" || ( error "$* failed"; return 1; )
}
- .gitlab-ci.yml
-+
-61
--
-0
-
-Viewed
-variables:
- # Commit of ghc/ci-images repository from which to pull Docker images
- DOCKER_REV: "853f348f9caf38b08740b280296fbd34e09abb3a"
-
- GHC_VERSION: 8.10.7
- CABAL_INSTALL_VERSION: 3.2.0.0
-
-workflow:
- rules:
- - if: $CI_COMMIT_TAG
- when: always
- - if: '$CI_PIPELINE_SOURCE == "web"'
- when: always
- - when: never
-
-.build:
- script:
- - bash .gitlab/ci.sh
- artifacts:
- expire_in: 2 week
- paths:
- - out
-
-build-aarch64-linux-deb10:
- extends: .build
- tags:
- - aarch64-linux
- image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
-
-build-armv7-linux-deb10:
- extends: .build
- tags:
- - armv7-linux
- image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
-
-build-x86_64-linux:
- extends: .build
- tags:
- - x86_64-linux
- image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
-
-build-x86_64-linux-alpine:
- extends: .build
- tags:
- - x86_64-linux
- image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV"
-
-build-x86_64-freebsd:
- extends: .build
- tags:
- - x86_64-freebsd
-
-build-x86_64-darwin:
- extends: .build
- tags:
- - x86_64-darwin
-
-build-x86_64-windows:
- extends: .build
- tags:
- - new-x86_64-windows
diff --git a/cabal.project.release b/cabal.project.release
index fcc1a38e85..82a7b7a9dc 100644
--- a/cabal.project.release
+++ b/cabal.project.release
@@ -2,10 +2,8 @@ packages: Cabal/
packages: cabal-install/
tests: False
benchmarks: False
-optimizations: True
+optimization: True
+
+optional-packages: ./vendored/*/*.cabal
-package Cabal
- ghc-options: -fexpose-all-unfoldings -fspecialise-aggressively
-package parsec
- ghc-options: -fexpose-all-unfoldings
--
GitLab