release: use Alpine Linux 3.6, GHC from community repository, and static flag (closes #3045)

Author: borsboom

etc/scripts/release.hs

@@ -103,8 +103,7 @@ options =
         "Label to give the uploaded release asset"
     , Option "" [noTestHaddocksOptName] (NoArg $ Right $ \g -> g{gTestHaddocks = False})
         "Disable testing building haddocks."
-      -- FIXME: Use 'static' flag in stack.cabal instead.  See https://github.com/commercialhaskell/stack/issues/3045.
-    , Option "" [staticOptName] (NoArg $ Right $ \g -> g{gBuildArgs = gBuildArgs g ++ ["--split-objs", "--ghc-options=-optc-Os -optl-static -fPIC"]})
+    , Option "" [staticOptName] (NoArg $ Right $ \g -> g{gBuildArgs = gBuildArgs g ++ ["--flag=stack:static"]})
         "Build a static binary."
     , Option "" [buildArgsOptName]
         (ReqArg
@@ -162,7 +161,7 @@ rules global@Global{..} args = do
                     c
             () <- cmd0 "install" gBuildArgs $ concat $ concat
                 [["--pedantic --no-haddock-deps"], [" --haddock" | gTestHaddocks]]
-            () <- cmd0 (Cwd "etc/scripts") "install" gBuildArgs "cabal-install"
+            () <- cmd0 (Cwd "etc/scripts") "install" "cabal-install"
             let cmd' c = cmd (AddPath [tmpDir] []) stackProgName (stackArgs global) c
             () <- cmd' "test" gBuildArgs "--pedantic --flag stack:integration-tests"
             return ()

etc/scripts/vagrant-releases.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -xe
-"$(dirname "$0")/with-vagrant.sh" alpine-3.4-x86_64 "--binary-variant=static --static $* release"
+"$(dirname "$0")/with-vagrant.sh" alpine-3.6-x86_64 "--binary-variant=static --static $* release"
 "$(dirname "$0")/with-vagrant.sh" freebsd-11.0-amd64 "$* release" "export LANG=en_US.UTF-8;"
 "$(dirname "$0")/with-vagrant.sh" debian-7-amd64 "$* release"
 "$(dirname "$0")/with-vagrant.sh" debian-7-i386 "$* release"

etc/vagrant/alpine-3.4-x86_64/Vagrantfile renamed to etc/vagrant/alpine-3.6-x86_64/Vagrantfile

@@ -1,5 +1,5 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = "maier/alpine-3.4-x86_64"
+  config.vm.box = "maier/alpine-3.6-x86_64"
   config.vm.synced_folder ENV['STACK_BUILD_DIR'], "/vagrant-build", type: "rsync", rsync__verbose: true, rsync__exclude: [".stack-work/", "_release/", ".cabal-sandbox/", "cabal.sandbox.config", "dist/", ".#*#", "*.vdi", "*.vmdk"], rsync__args: ["--verbose", "--archive", "--delete", "-z", "--copy-links"], rsync__rsync_path: "/usr/bin/rsync", rsync__chown: false
   config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__verbose: true, rsync__exclude: [".stack-work/", "_release/", ".cabal-sandbox/", "cabal.sandbox.config", "dist/", ".#*#", "*.vdi", "*.vmdk"], rsync__args: ["--verbose", "--archive", "--delete", "-z", "--copy-links"], rsync__rsync_path: "/usr/bin/rsync", rsync__chown: false
   config.vm.provider "virtualbox" do |vb|
@@ -8,18 +8,9 @@ Vagrant.configure(2) do |config|
   config.ssh.forward_agent = true
   config.vm.provision "shell", inline: <<-SHELL
     set -xe
-    #FIXME: See https://github.com/commercialhaskell/stack/issues/3045, probably use:
-    #FIXME:    apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing ghc ghc-dev cabal
-    if ! grep 's3-us-west-2\.amazonaws\.com/alpine-ghc/7\.10' /etc/apk/repositories; then
-      echo "https://s3-us-west-2.amazonaws.com/alpine-ghc/7.10" |sudo tee -a /etc/apk/repositories
-    fi
-    if ! test -s /etc/apk/keys/[email protected]; then
-      curl -o /etc/apk/keys/[email protected] https://raw.githubusercontent.com/mitchty/alpine-ghc/master/mitch.tishmack%40gmail.com-55881c97.rsa.pub
-    fi
-    apk -q update
-    apk add alpine-sdk linux-headers musl-dev gmp-dev zlib-dev ghc git rsync gnupg xz
-    cp /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginT.o /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginT.o.orig
-    cp /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginS.o /usr/lib/gcc/x86_64-alpine-linux-musl/5.3.0/crtbeginT.o
+    apk update
+    apk add alpine-sdk linux-headers musl-dev gmp-dev zlib-dev git rsync gnupg xz
+    apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/edge/community ghc ghc-dev cabal
     if ! which stack; then
       curl -sSL https://www.stackage.org/stack/linux-x86_64-static \
         | tar xzvf - --wildcards --strip-components=1 -C /usr/local/bin '*/stack'