Skip to content

Commit c044066

Browse files
authored
Merge pull request #3023 from IntersectMBO/artur/update_cabal_build_tests
Cabal build tests - Remove manual pkgconf build and update GHC and Cabal
2 parents 33ea984 + 793bfa3 commit c044066

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

cabal_build_tests/fedora/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
66

77
ENV TAGGED_VERSION ''
88
COPY install-node.sh /
9-
# pkg-config 1.9.5 breaks cabal dependency checking
10-
# pkg-config 2 isn't available yet for fedora so we need to build it from source
119
RUN yum update -y && \
12-
yum install git diffutils gcc gcc-c++ tmux gmp-devel make tar xz wget zlib-devel libtool autoconf -y && \
13-
mkdir -p /root/src/ && cd /root/src && \
14-
curl -O https://distfiles.ariadne.space/pkgconf/pkgconf-2.0.3.tar.xz && \
15-
tar -xvf pkgconf-2.0.3.tar.xz && \
16-
cd pkgconf-2.0.3 && \
17-
./configure && make && make install && \
10+
yum install git diffutils gcc gcc-c++ awk tmux gmp-devel make tar xz wget zlib-devel libtool autoconf -y && \
1811
chmod +x /install-node.sh
1912

2013
CMD ./install-node.sh $TAGGED_VERSION

cabal_build_tests/install-node.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# Please note: 'source ~/.bashrc' cmd is not used because Docker runs this script as subscript
88

99
# Versions
10-
GHC_VERSION="9.6.3"
11-
CABAL_VERSION="3.10.2.0"
10+
GHC_VERSION="9.6.7"
11+
CABAL_VERSION="3.12.1.0"
1212

1313
echo ""
1414

0 commit comments

Comments
 (0)