Skip to content

Commit bbc5fb4

Browse files
committed
CI: remove libfmt from nightly dependencies
All current images ship a recent enough compiler w/ C++20 text formatting support.
1 parent c01408a commit bbc5fb4

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

ci/install_dependencies.sh

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ debian_build_gtest() {
2020
cd ..
2121
}
2222

23-
# workaround for really bare-bones Archlinux containers:
24-
if [ -x "$(command -v pacman)" ]; then
25-
pacman --noconfirm -Sy
26-
pacman --noconfirm --needed -S grep gawk sed
27-
fi
23+
# workaround for really old bare-bones Archlinux containers:
24+
# if [ -x "$(command -v pacman)" ]; then
25+
# pacman --noconfirm -Sy
26+
# pacman --noconfirm --needed -S grep gawk sed
27+
# fi
2828

2929
distro_id=$(grep '^ID=' /etc/os-release|awk -F = '{print $2}'|sed 's/\"//g')
3030

@@ -35,40 +35,38 @@ case "$distro_id" in
3535

3636
'debian')
3737
apt-get update
38-
apt-get install -y cmake ninja-build g++ clang libexpat1-dev zlib1g-dev libbrotli-dev libssh-dev libcurl4-openssl-dev libgmock-dev libxml2-utils libinih-dev libfmt-dev
38+
apt-get install -y cmake ninja-build g++ clang libexpat1-dev zlib1g-dev libbrotli-dev libssh-dev libcurl4-openssl-dev libgmock-dev libxml2-utils libinih-dev
3939
# debian_build_gtest
4040
;;
4141

4242
'arch')
4343
pacman --noconfirm -Syu
44-
pacman --noconfirm --needed -S gcc clang cmake ninja expat zlib brotli libssh curl gtest libinih fmt
44+
pacman --noconfirm --needed -S gcc clang cmake ninja expat zlib brotli libssh curl gtest libinih
4545
;;
4646

4747
'ubuntu')
4848
apt-get update
49-
apt-get install -y cmake ninja-build g++ clang libexpat1-dev zlib1g-dev libbrotli-dev libssh-dev libcurl4-openssl-dev libgmock-dev libxml2-utils libinih-dev libfmt-dev
49+
apt-get install -y cmake ninja-build g++ clang libexpat1-dev zlib1g-dev libbrotli-dev libssh-dev libcurl4-openssl-dev libgmock-dev libxml2-utils libinih-dev
5050
# debian_build_gtest
5151
;;
5252

5353
'alpine')
5454
apk update
55-
apk add gcc g++ clang cmake samurai expat-dev zlib-dev brotli-dev libssh-dev curl-dev gtest gtest-dev gmock libintl gettext-dev libxml2-utils inih-dev inih-inireader-dev fmt-dev
55+
apk add gcc g++ clang cmake samurai expat-dev zlib-dev brotli-dev libssh-dev curl-dev gtest gtest-dev gmock libintl gettext-dev libxml2-utils inih-dev inih-inireader-dev
5656
;;
5757

5858
'rhel')
59-
dnf clean all
60-
dnf -y install gcc-c++ clang cmake ninja-build expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel inih-devel
59+
dnf -y --refresh install gcc-c++ clang cmake ninja-build expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel inih-devel
6160
;;
6261

6362
'centos')
64-
dnf clean all
65-
dnf -y install gcc-c++ clang cmake expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel
66-
dnf -y --enablerepo=crb install ninja-build inih-devel
63+
dnf -y --refresh install gcc-c++ clang cmake expat-devel zlib-devel brotli-devel libssh-devel libcurl-devel
64+
dnf -y --refresh --enablerepo=crb install ninja-build inih-devel
6765
;;
6866

6967
'opensuse-tumbleweed')
7068
zypper --non-interactive refresh
71-
zypper --non-interactive install gcc-c++ clang cmake ninja libexpat-devel zlib-devel libbrotli-devel libssh-devel libcurl-devel gmock libxml2-tools libinih-devel libfmt-devel
69+
zypper --non-interactive install gcc-c++ clang cmake ninja libexpat-devel zlib-devel libbrotli-devel libssh-devel libcurl-devel gmock libxml2-tools libinih-devel
7270
;;
7371
*)
7472
echo "Sorry, no predefined dependencies for your distribution $distro_id exist yet"

0 commit comments

Comments
 (0)