release: script updates

* Vagrantfiles: use puppetlabs boxes for everything
* Use --install-ghc when building release script
* Add rsync__args to Vagrantfiles
* Copy GPG key to Vagrant VMs

Author: borsboom

etc/scripts/osx-release.sh

@@ -3,5 +3,5 @@
 set -xe
 RELEASE_SCRIPT=.local/bin/stack-release-script
 rm -f "$RELEASE_SCRIPT"
-(cd etc/scripts && stack build)
+(cd etc/scripts && stack --install-ghc build)
 $(cd etc/scripts && stack exec which stack-release-script) --arch=x86_64 --upload-label="Mac OS X 64-bit" release

etc/scripts/vagrant-releases.sh

@@ -5,10 +5,11 @@ init_wd="$(pwd)"
 
 with_vagrant() {
   #TODO: set up gpg-agent forwarding for package signing (see http://superuser.com/questions/161973/how-can-i-forward-a-gpg-key-via-ssh-agent).
+  gpg --export-secret-keys --armor [email protected] >.stack-work/gpg-secret-key.asc
   pushd "$init_wd/etc/vagrant/$1"
   vagrant up --provision
   vagrant rsync
-  vagrant ssh -c "export GITHUB_AUTH_TOKEN=$GITHUB_AUTH_TOKEN; export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID; export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY; export AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION; cd /vagrant && (cd etc/scripts && stack build) && \$(cd etc/scripts && stack exec which stack-release-script) $2"
+  vagrant ssh -c "export GITHUB_AUTH_TOKEN=$GITHUB_AUTH_TOKEN; export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID; export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY; export AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION; gpg --import /vagrant/.stack-work/gpg-secret-key.asc; cd /vagrant && (cd etc/scripts && stack --install-ghc build) && \$(cd etc/scripts && stack exec which stack-release-script) $2"
   vagrant halt
   popd
 }

etc/scripts/windows-releases.bat

@@ -7,7 +7,7 @@ set TEMP=C:\tmp
 set RELEASE_SCRIPT=%APPDATA%\local\bin\stack-release-script.exe
 if exist %RELEASE_SCRIPT% del %RELEASE_SCRIPT%
 cd etc\scripts
-stack install
+stack --install-ghc install
 if errorlevel 1 exit /b
 cd ..\..
 %RELEASE_SCRIPT% --arch=i386 --upload-label="Windows 32-bit" release

etc/vagrant/centos-6-i386/Vagrantfile

@@ -1,25 +1,19 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 Vagrant.configure(2) do |config|
-  config.vm.box = "chef/centos-6.6-i386"
-  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"]
+  config.vm.box = "puppetlabs/centos-6.6-32-nocm"
+  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"]
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "2048"
   end
   config.ssh.forward_agent = true
   config.vm.provision "shell", inline: <<-SHELL
     set -xe
     export PATH=/usr/local/bin:$PATH
-    yum update
+    yum -y check-update || true
     yum -y install perl make automake gcc gmp-devel zlib-devel tar which git xz ncurses-devel
     curl -sSL https://www.stackage.org/stack/linux-i386-gmp4 \
       | tar xzvf - --wildcards --strip-components=1 -C /usr/local/bin '*/stack'
     chmod a+x /usr/local/bin/stack
-    if ! which cabal; then
-      pushd /vagrant
-      stack --install-ghc install cabal-install
-      cp `stack exec which cabal` /usr/local/bin/cabal
-      popd
-    fi
   SHELL
 end

etc/vagrant/centos-6-x86_64/Vagrantfile

@@ -1,27 +1,23 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 Vagrant.configure(2) do |config|
-  config.vm.box = "chef/centos-6.6"
-  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"]
+  config.vm.box = "puppetlabs/centos-6.6-64-nocm"
+  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"]
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "2048"
   end
   config.ssh.forward_agent = true
   config.vm.provision "shell", inline: <<-SHELL
     set -xe
     export PATH=/usr/local/bin:$PATH
-    yup update
+    yum -y check-update || true
     yum -y install epel-release
     yum -y install perl make automake gcc gmp-devel zlib-devel rpm-build tar which git xz python-boto deltarpm python-deltarpm rpm-build rpm-sign ncurses-devel
     if ! which stack; then
       curl -sSL https://s3.amazonaws.com/download.fpcomplete.com/centos/6/fpco.repo >/etc/yum.repos.d/fpco.repo
-      yum update
+      yum -y check-update || true
     fi
     yum -y install stack
-    if ! which cabal; then
-      stack --install-ghc build cabal-install
-      cp `stack exec which cabal` /usr/local/bin/cabal
-    fi
     if ! which fpm; then
         yum -y install ruby-devel
         yum -y install rubygems

etc/vagrant/centos-7-x86_64/Vagrantfile

@@ -1,29 +1,23 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 Vagrant.configure(2) do |config|
-  config.vm.box = "chef/centos-7.0"
-  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"]
+  config.vm.box = "puppetlabs/centos-7.0-64-nocm"
+  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"]
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "2048"
   end
   config.ssh.forward_agent = true
   config.vm.provision "shell", inline: <<-SHELL
     set -xe
     export PATH=/usr/local/bin:$PATH
-    yup update
+    yum -y check-update || true
     yum -y install epel-release
     yum -y install perl make automake gcc gmp-devel zlib-devel tar which git python-boto deltarpm python-deltarpm rpm-build rpm-sign ncurses-devel
     if ! which stack; then
       curl -sSL https://s3.amazonaws.com/download.fpcomplete.com/centos/7/fpco.repo >/etc/yum.repos.d/fpco.repo
-      yum update
+      yum -y check-update || true
     fi
     yum -y install stack
-    if ! which cabal; then
-      pushd /vagrant
-      stack --install-ghc install cabal-install
-      cp `stack exec which cabal` /usr/local/bin/cabal
-      popd
-    fi
     if ! which fpm; then
         yum -y install ruby-devel
         gem install fpm --version '< 1.4.0'

etc/vagrant/debian-7-amd64/Vagrantfile

@@ -1,8 +1,8 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 Vagrant.configure(2) do |config|
-  config.vm.box = "chef/debian-7.8"
-  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"]
+  config.vm.box = "puppetlabs/debian-7.8-64-nocm"
+  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"]
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "2048"
   end
@@ -19,10 +19,6 @@ Vagrant.configure(2) do |config|
       apt-get update
     fi
     apt-get install -y stack
-    if ! which cabal; then
-      stack --install-ghc build cabal-install
-      sudo cp `stack exec which cabal` /usr/local/bin/cabal
-    fi
     if ! which fpm; then
         apt-get install -y ruby-dev libffi-dev make build-essential
         apt-get install -y rubygems || true

etc/vagrant/debian-7-i386/Vagrantfile

@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 Vagrant.configure(2) do |config|
   config.vm.box = "puppetlabs/debian-7.8-32-nocm"
-  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"]
+  config.vm.synced_folder "../../..", "/vagrant", type: "rsync", rsync__exclude: [".stack_work/", "_release/"], rsync__args: ["--verbose", "--archive", "--delete", "-z"]
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "2048"
   end
@@ -16,10 +16,6 @@ Vagrant.configure(2) do |config|
     curl -sSL https://www.stackage.org/stack/linux-i386 \
       | tar xzvf - --wildcards --strip-components=1 -C /usr/local/bin '*/stack'
     chmod a+x /usr/local/bin/stack
-    if ! which cabal; then
-      stack --install-ghc build cabal-install
-      cp `stack exec which cabal` /usr/local/bin/cabal
-    fi
     if ! which fpm; then
       apt-get install -y ruby-dev libffi-dev make build-essential
       apt-get install -y rubygems || true