diff options
| author | Loïc Hoguin <[email protected]> | 2018-05-15 14:42:45 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-05-15 14:42:45 +0200 |
| commit | 66ed50404a6215851a80607cdca1d378c923b61a (patch) | |
| tree | 29edc6b08b1d86c173133989b556f678481089fc | |
| parent | 8312bace1db8bd4a8aa6dd1718adebd0ded746ff (diff) | |
| download | ci-66ed50404a6215851a80607cdca1d378c923b61a.tar.gz ci-66ed50404a6215851a80607cdca1d378c923b61a.tar.bz2 ci-66ed50404a6215851a80607cdca1d378c923b61a.zip | |
Fix OpenSSL-1.0 for BuildKite
| -rwxr-xr-x | archlinux.sh | 1 | ||||
| -rw-r--r-- | ci.d/openssl | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/archlinux.sh b/archlinux.sh index 1aa8a59..fc783a1 100755 --- a/archlinux.sh +++ b/archlinux.sh @@ -22,5 +22,6 @@ pacman_install $PACKAGES openssl_fix_10 archlinux_enable_cron buildkite_install $DIST $BUILDKITE_TOKEN +openssl_fix_10_buildkite ssh_copy_host_key lxc_restart diff --git a/ci.d/openssl b/ci.d/openssl index e08397b..139c595 100644 --- a/ci.d/openssl +++ b/ci.d/openssl @@ -4,13 +4,18 @@ # # Setup OpenSSL 1.0 for older Erlang versions. openssl_fix_10() { - BUILDKITE_PATH=/root/.buildkite-agent lxc_do mkdir /root/openssl-1.0 lxc_do ln -s /usr/include/openssl-1.0 /root/openssl-1.0/include lxc_do ln -s /usr/lib/openssl-1.0 /root/openssl-1.0/lib echo "lxc.environment = KERL_CONFIGURE_OPTIONS=--with-ssl=/root/openssl-1.0" \ >> /home/lxc/$NAME/config - # Also install a BuildKite hook setting this environment value. +} + +# openssl_fix_10_buildkite +# +# Setup OpenSSL 1.0 also in Buildkite. +openssl_fix_10_buildkite() { + BUILDKITE_PATH=/root/.buildkite-agent <$( cd "$( dirname "$0" )" && pwd )/priv/buildkite-environment-hook-openssl-fix-10 \ lxc_do bash -c "cat > $BUILDKITE_PATH/hooks/environment" lxc_do chmod +x $BUILDKITE_PATH/hooks/environment |