f

0f06f147 · Julian Ospald · 49a709b2 · 0f06f147 · 0f06f147 · 0f06f147
Verified Commit 0f06f147 authored 4 years ago by Julian Ospald
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ variables:
    OS: "LINUX"
    ARCH: "64"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"
    CROSS: ""

 .alpine:64bit:
@@ -31,6 +32,7 @@ variables:
    OS: "LINUX"
    ARCH: "64"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"

 .alpine:32bit:
  image: "i386/alpine:3.12"
@@ -40,6 +42,7 @@ variables:
    OS: "LINUX"
    ARCH: "32"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"

 .linux:armv7:
  image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
@@ -49,6 +52,7 @@ variables:
    OS: "LINUX"
    ARCH: "ARM"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"

 .linux:aarch64:
  image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
@@ -58,6 +62,7 @@ variables:
    OS: "LINUX"
    ARCH: "ARM64"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"

 .darwin:
  tags:
@@ -66,6 +71,7 @@ variables:
    OS: "DARWIN"
    ARCH: "64"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"

 .darwin:aarch64:
  tags:
@@ -74,6 +80,7 @@ variables:
    OS: "DARWIN"
    ARCH: "ARM64"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"

 .freebsd:
  tags:
@@ -82,6 +89,7 @@ variables:
    OS: "FREEBSD"
    ARCH: "64"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"

 .windows:
  tags:
@@ -90,6 +98,7 @@ variables:
    OS: "WINDOWS"
    ARCH: "64"
    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+    STACK_ROOT: "$CI_PROJECT_DIR/sr/stack_root"


 ############################################################
@@ -165,10 +174,10 @@ variables:
        --pure \
        --keep CI_PROJECT_DIR \
        --keep MACOSX_DEPLOYMENT_TARGET \
-        --keep ARTIFACT \
        --keep OS \
        --keep ARCH \
        --keep CABAL_DIR \
+        --keep STACK_ROOT \
        --keep GHC_VERSION \
        --keep CABAL_VERSION \
        --run "$1" 2>&1
@@ -191,6 +200,7 @@ variables:
    - .root_cleanup
  before_script:
    - set CABAL_DIR="$CI_PROJECT_DIR/cabal"
+    - set STACK_ROOT="$CI_PROJECT_DIR/sr/stack_root"
    - bash ./.gitlab/before_script/windows/install_deps.sh

 .release_stack:
@@ -304,7 +314,6 @@ release:linux:64bit:
  before_script:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
-    ARTIFACT: "x86_64-linux-stack"
    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"

@@ -318,7 +327,6 @@ release:linux:32bit:
  before_script:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
-    ARTIFACT: "i386-linux-stack"
    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.2.0.0"

@@ -331,7 +339,6 @@ release:linux:armv7:
  before_script:
    - ./.gitlab/before_script/linux/install_deps.sh
  variables:
-    ARTIFACT: "armv7-linux-stack"
    GHC_VERSION: "8.10.4"
    CABAL_VERSION: "3.4.0.0"
    CROSS: ""
@@ -345,7 +352,6 @@ release:linux:aarch64:
  before_script:
    - ./.gitlab/before_script/linux/install_deps.sh
  variables:
-    ARTIFACT: "aarch64-linux-stack"
    GHC_VERSION: "8.10.4"
    CABAL_VERSION: "3.4.0.0"
    CROSS: ""
@@ -362,7 +368,6 @@ release:darwin:
  before_script:
    - ./.gitlab/before_script/darwin/install_deps.sh
  variables:
-    ARTIFACT: "x86_64-apple-darwin-stack"
    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
    MACOSX_DEPLOYMENT_TARGET: "10.7"
@@ -383,10 +388,10 @@ release:darwin:aarch64:
        --pure \
        --keep CI_PROJECT_DIR \
        --keep MACOSX_DEPLOYMENT_TARGET \
-        --keep ARTIFACT \
        --keep OS \
        --keep ARCH \
        --keep CABAL_DIR \
+        --keep STACK_ROOT \
        --keep GHC_VERSION \
        --keep CABAL_VERSION \
        --run "$1" 2>&1
@@ -394,7 +399,6 @@ release:darwin:aarch64:
    runInNixShell ./.gitlab/before_script/darwin/install_deps.sh 2>&1
    runInNixShell ./.gitlab/script/stack_release.sh 2>&1
  variables:
-    ARTIFACT: "aarch64-apple-darwin-stack"
    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
    MACOSX_DEPLOYMENT_TARGET: "10.7"
@@ -413,7 +417,6 @@ release:freebsd:
  before_script:
    - ./.gitlab/before_script/freebsd/install_deps.sh
  variables:
-    ARTIFACT: "x86_64-portbld-freebsd-stack"
    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"
  allow_failure: true
@@ -430,7 +433,6 @@ release:windows:
  before_script:
    - bash ./.gitlab/before_script/windows/install_deps.sh
  variables:
-    ARTIFACT: "x86_64-mingw64-stack"
    GHC_VERSION: "8.10.5"
    CABAL_VERSION: "3.4.0.0"


--- a/.gitlab/before_script/darwin/install_deps.sh
+++ b/.gitlab/before_script/darwin/install_deps.sh
@@ -5,7 +5,7 @@ set -eux
 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"

 mkdir -p "${TMPDIR}"
-mkdir -p "${CI_PROJECT_DIR}"/sr
+mkdir -p "${STACK_ROOT}"

 if [ $ARCH = 'ARM64' ] ; then
 	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 > ./ghcup-bin

--- a/.gitlab/before_script/freebsd/install_deps.sh
+++ b/.gitlab/before_script/freebsd/install_deps.sh
@@ -7,7 +7,7 @@ set -eux
 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"

 mkdir -p "${TMPDIR}"
-mkdir -p "${CI_PROJECT_DIR}"/sr
+mkdir -p "${STACK_ROOT}"

 curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-portbld-freebsd-ghcup > ./ghcup-bin
 chmod +x ghcup-bin

--- a/.gitlab/before_script/linux/alpine/install_deps.sh
+++ b/.gitlab/before_script/linux/alpine/install_deps.sh
@@ -5,7 +5,7 @@ set -eux
 . "$( cd "$(dirname "$0")" ; pwd -P )/../../../ghcup_env"

 mkdir -p "${TMPDIR}"
-mkdir -p "${CI_PROJECT_DIR}"/sr
+mkdir -p "${STACK_ROOT}"

 apk add --no-cache \
 	curl \

--- a/.gitlab/before_script/linux/install_deps.sh
+++ b/.gitlab/before_script/linux/install_deps.sh
@@ -5,7 +5,7 @@ set -eux
 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"

 mkdir -p "${TMPDIR}"
-mkdir -p "${CI_PROJECT_DIR}"/sr
+mkdir -p "${STACK_ROOT}"

 sudo apt-get update -y
 sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https

--- a/.gitlab/before_script/linux/install_deps_minimal.sh
+++ b/.gitlab/before_script/linux/install_deps_minimal.sh
@@ -5,7 +5,7 @@ set -eux
 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"

 mkdir -p "${TMPDIR}"
-mkdir -p "${CI_PROJECT_DIR}"/sr
+mkdir -p "${STACK_ROOT}"

 sudo apt-get update -y
 sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget
--- a/.gitlab/ghcup_env
+++ b/.gitlab/ghcup_env
 if [ "${OS}" = "WINDOWS" ] ; then
 	export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
-	export STACK_ROOT="$CI_PROJECT_DIR/sr/stack_root"
 	export PATH="$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin:$CI_PROJECT_DIR/.local/bin:$PATH"
 	export TMPDIR="$CI_PROJECT_DIR/tmp"
 else
 	export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
-	export STACK_ROOT="$CI_PROJECT_DIR/sr/stack_root"
 	export PATH="$CI_PROJECT_DIR/.ghcup/bin:$CI_PROJECT_DIR/.local/bin:/opt/llvm/bin:$PATH"
 	export TMPDIR="$CI_PROJECT_DIR/tmp"
 fi
--- a/.gitlab/script/stack_release.sh
+++ b/.gitlab/script/stack_release.sh
@@ -14,30 +14,32 @@ git config --global core.fscache false

 git describe

-#if [ "${OS}" = "LINUX" ]
-#then
+if [ "${OS}" = "LINUX" ]
+then
  # Retry installing nix due to nondeterministic error
  #   Fatal error: glibc detected an invalid stdio handle
  # See:
  #   https://github.com/nh2/static-haskell-nix/pull/27#issuecomment-502652181
  #   https://github.com/NixOS/nix/issues/2733
  #
-  #(for i in {1..5}; do bash <(curl -sSL https://nixos.org/nix/install) && exit 0; done; exit 1)
-  #. ~/.nix-profile/etc/profile.d/nix.sh
-  #nix-channel --add https://nixos.org/channels/nixos-19.09 nixpkgs
-  #nix-channel --update # Get GHC 8.2.2
-#elif [[ "${OS}" == "WINDOWS" ]]
-#then
-#  choco install nsis-unicode -y
-#fi
+  mkdir -m 0755 /nix && chown root /nix
+  (for i in {1..5}; do sh <(curl -sSL https://nixos.org/nix/install) && exit 0; done; exit 1)
+  . ~/.nix-profile/etc/profile.d/nix.sh
+  nix-channel --add https://nixos.org/channels/nixos-19.09 nixpkgs
+  nix-channel --update
+elif [ "${OS}" == "WINDOWS" ]
+then
+  # choco install nsis-unicode -y
+  echo "nothing"
+fi

 # Do this in the same step as installing deps to get relevant env var modifications
 if [ "${OS}" = "LINUX" ]
 then
-	stack etc/scripts/release.hs check --alpine
-	stack etc/scripts/release.hs build --alpine
+	stack etc/scripts/release.hs check --allow-dirty --alpine
+	stack etc/scripts/release.hs build --allow-dirty --alpine
 else
-	stack etc/scripts/release.hs check
-	stack etc/scripts/release.hs build
+	stack etc/scripts/release.hs check --allow-dirty
+	stack etc/scripts/release.hs build --allow-dirty
 fi

--- a/.gitlab/script/stack_unit_test.sh
+++ b/.gitlab/script/stack_unit_test.sh
@@ -24,6 +24,9 @@ git describe --always

 ecabal update

+echo '' >> stack.yaml
+echo 'allow-different-user: true' >> stack.yaml
+
 ecabal build -w ghc-${GHC_VERSION}
 ecabal test -w ghc-${GHC_VERSION}
 ecabal haddock -w ghc-${GHC_VERSION}