From dba0d2df42cc304e54a1f9781f1c5270931754b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sat, 29 Jun 2019 11:00:36 +0200 Subject: Update alpine packages I have not tested the apk_install_erlang() function but it should be doing roughly what we want. Test it on the next rebuild. --- alpine.sh | 5 +++-- ci.d/apk | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/alpine.sh b/alpine.sh index 1aebc92..7d523eb 100755 --- a/alpine.sh +++ b/alpine.sh @@ -8,9 +8,9 @@ DIST=alpine RELEASE=edge ARCH=amd64 PACKAGES="pcre ca-certificates openssl-dev ncurses-dev zlib-dev \ - openssh bash curl zsh vim sudo erlang erlang-crypto erlang-dev git build-base autoconf gawk \ + openssh bash curl zsh vim sudo git build-base autoconf gawk \ go dep shadow rsync sdl2-dev sdl2_image-dev sdl2_ttf-dev p7zip \ - cppcheck clang-analyzer groff parallel mercurial subversion" + cppcheck clang-analyzer groff parallel mercurial subversion grep unzip" for f in ci.d/*; do source "$f"; done @@ -20,6 +20,7 @@ lxc_create $DIST $RELEASE $ARCH lxc_wait_for_ip apk_upgrade apk_install $PACKAGES +apk_install_erlang buildkite_install $DIST $BUILDKITE_TOKEN ssh_copy_host_key ssh_copy_host_key buildkite-agent /home/buildkite-agent diff --git a/ci.d/apk b/ci.d/apk index e622754..5918b99 100644 --- a/ci.d/apk +++ b/ci.d/apk @@ -9,3 +9,13 @@ apk_upgrade() { apk_install() { lxc_do apk add "$@" } + +# apk_install_erlang +# +# Necessary because erlang has been split up into +# a zillion silly packages. +apk_install_erlang() { + VSN=`lxc_do apk search -x erlang | cut -d- -f 2-` + ERLANG=`lxc_do apk search erlang | sed s/-$VSN//` + lxc_do apk add $ERLANG +} -- cgit v1.2.3