From cb6da863d0c14c2d93916c3e0cf45c1c33b3143d Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Fri, 20 May 2016 06:37:55 -0700 Subject: [PATCH] release: support official FreeBSD bindist (#1253) --- ChangeLog.md | 6 ++++++ doc/MAINTAINER_GUIDE.md | 8 ++------ doc/README.md | 2 +- doc/install_and_upgrade.md | 14 ++++++++++++++ etc/scripts/vagrant-releases.sh | 1 + etc/scripts/with-vagrant.sh | 6 +++++- etc/vagrant/freebsd-10.3-amd64/Vagrantfile | 20 ++++++++++++++++++++ 7 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 etc/vagrant/freebsd-10.3-amd64/Vagrantfile diff --git a/ChangeLog.md b/ChangeLog.md index 1e9683df66..f45c20afb6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,12 @@ ## 1.1.2 +Release notes: + +* Official FreeBSD binaries are + [now available](http://docs.haskellstack.org/en/stable/install_and_upgrade/#freebsd) + [#1253](https://github.com/commercialhaskell/stack/issues/1253). + Major changes: * Extensible custom snapshots implemented. These allow you to define snapshots diff --git a/doc/MAINTAINER_GUIDE.md b/doc/MAINTAINER_GUIDE.md index 338ab65220..5dca40e7be 100644 --- a/doc/MAINTAINER_GUIDE.md +++ b/doc/MAINTAINER_GUIDE.md @@ -1,10 +1,5 @@ # Maintainer guide -## Next release: - -* Integrate FreeBSD binaries and packages - [#1253](https://github.com/commercialhaskell/stack/issues/1253#issuecomment-185993240) - ## Pre-release steps * Ensure `release` and `stable` branches merged to `master` @@ -43,11 +38,12 @@ * Look for any links to "latest" documentation, replace with version tag * Ensure all documentation pages listed in `mkdocs.yaml` * Check that any new Linux distribution versions added to - `etc/scripts/release.hs` and `etc/scripts/vagrant-releases.sh`. + `etc/scripts/release.hs` and `etc/scripts/vagrant-releases.sh` * [Ubuntu](https://wiki.ubuntu.com/Releases) * [Debian](https://www.debian.org/releases/) (keep at least latest two) * [CentOS](https://wiki.centos.org/Download) * [Fedora](https://fedoraproject.org/wiki/Releases) + * Check for new FreeBSD release * Check that no new entries need to be added to [releases.yaml](https://github.com/fpco/stackage-content/blob/master/stack/releases.yaml), [install_and_upgrade.md](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md), diff --git a/doc/README.md b/doc/README.md index c3d014393f..13310bbd5b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -27,7 +27,7 @@ Downloads are available by operating system: * [Arch Linux](install_and_upgrade.md#arch-linux) * [NixOS](install_and_upgrade.md#nixos) * [Linux (general)](install_and_upgrade.md#linux) -* [FreeBSD (unofficial)](install_and_upgrade.md#freebsd) +* [FreeBSD](install_and_upgrade.md#freebsd) [Upgrade instructions](install_and_upgrade.md#upgrade) diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md index 2ddc16a110..8222830507 100644 --- a/doc/install_and_upgrade.md +++ b/doc/install_and_upgrade.md @@ -271,6 +271,20 @@ For Gentoo users, make sure to have the `ncurses` package with `USE=tinfo` (with ## FreeBSD +(only 64-bit currently available, tested on FreeBSD 10.3-RELEASE) + +* Install required dependencies: + + pkg install devel/gmake perl5 lang/gcc misc/compat8x misc/compat9x converters/libiconv ca_root_nss + +* Download the latest release: + + * [FreeBSD 64-bit](https://www.stackage.org/stack/freebsd-x86_64) + +* Extract the archive and place `stack` somewhere on your `$PATH` (see [Path section below](#path)) + +* Now you can run `stack` from the terminal. + An unofficial package repository for FreeBSD 10 (amd64 only) and install instructions are available at [http://stack-pkg.applicative.tech](http://stack-pkg.applicative.tech/). The repository is not official and as such might lag behind new releases. See [issue #1253](https://github.com/commercialhaskell/stack/issues/1253) diff --git a/etc/scripts/vagrant-releases.sh b/etc/scripts/vagrant-releases.sh index e0fd6b3ef7..9c449a75e6 100755 --- a/etc/scripts/vagrant-releases.sh +++ b/etc/scripts/vagrant-releases.sh @@ -4,3 +4,4 @@ set -xe "$(dirname "$0")/with-vagrant.sh" debian-7-i386 "--upload-label='Linux 32-bit, standard' $* release" "$(dirname "$0")/with-vagrant.sh" centos-6-x86_64 "--binary-variant=gmp4 --upload-label='Linux 64-bit, libgmp4 for CentOS 6.x' $* release" "$(dirname "$0")/with-vagrant.sh" centos-6-i386 "--binary-variant=gmp4 --upload-label='Linux 32-bit, libgmp4 for CentOS 6.x' $* release" +"$(dirname "$0")/with-vagrant.sh" freebsd-10.3-amd64 "--upload-label='FreeBSD 64-bit' $* release" "export LANG=en_US.UTF-8;" diff --git a/etc/scripts/with-vagrant.sh b/etc/scripts/with-vagrant.sh index 59f28e57ca..a7ce1a247c 100755 --- a/etc/scripts/with-vagrant.sh +++ b/etc/scripts/with-vagrant.sh @@ -4,8 +4,12 @@ set -xe #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 dev@fpcomplete.com >.stack-work/gpg-secret-key.asc cd "etc/vagrant/$1" + +# Double 'vagrant up' is a workaround for FreeBSD +vagrant up || true vagrant up + vagrant 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; export AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN; 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) --no-test-haddocks $2" +vagrant ssh -c "$3 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; export AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN; 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) --no-test-haddocks $2" vagrant halt diff --git a/etc/vagrant/freebsd-10.3-amd64/Vagrantfile b/etc/vagrant/freebsd-10.3-amd64/Vagrantfile new file mode 100644 index 0000000000..4fac70e6f4 --- /dev/null +++ b/etc/vagrant/freebsd-10.3-amd64/Vagrantfile @@ -0,0 +1,20 @@ +Vagrant.configure(2) do |config| + config.vm.box = "freebsd/FreeBSD-10.3-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 + config.ssh.forward_agent = true + config.ssh.shell = "/bin/sh" + config.vm.provision "shell", inline: <<-SHELL + set -xe + if ! which stack; then + mkdir -p /usr/local/etc/pkg/repos + cd /usr/local/etc/pkg/repos + fetch --no-verify-peer --no-verify-hostname https://stack-pkg.applicative.tech/stack-pkg-applicative-tech.conf + fetch --no-verify-peer --no-verify-hostname https://stack-pkg.applicative.tech/stack-pkg-applicative-tech.pub + pkg update + fi + pkg install -y stack ca_root_nss gmake awscli git gnupg + SHELL +end