Skip to content

Commit

Permalink
Move apk install to build-in-docker.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
probonopd authored May 12, 2024
1 parent 84d3d82 commit ec19c03
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ci/build-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ set -euxo pipefail
apk add bash git gcc g++ cmake make file wget \
gpgme-dev libgcrypt-dev libgcrypt-static argp-standalone zstd-dev zstd-static util-linux-static \
glib-static libassuan-static zlib-static libgpg-error-static \
curl-dev curl-static nghttp2-static libidn2-static openssl-libs-static brotli-static c-ares-static libunistring-static
curl-dev curl-static nghttp2-static libidn2-static openssl-libs-static brotli-static c-ares-static libunistring-static \
glib-static glib-dev autoconf automake
# libcurl's pkg-config scripts are broken. everywhere, everytime.
# these additional flags have been collected from all the .pc files whose libs are mentioned as -l<lib> in Libs.private
Expand Down
3 changes: 2 additions & 1 deletion ci/install-static-desktop-file-validate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ trap cleanup EXIT

pushd "$build_dir"

apk add glib-static glib-dev autoconf automake
# apk add glib-static glib-dev autoconf automake # Moved to build-in-docker.sh

wget -c "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/archive/"$version"/desktop-file-utils-"$version".tar.gz"
tar xf desktop-file-utils-*.tar.gz
cd desktop-file-utils-*/
Expand Down

0 comments on commit ec19c03

Please sign in to comment.