Skip to content

Cabal build tests - Remove manual pkgconf build and update GHC and Cabal #3023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 13, 2025
Merged

Cabal build tests - Remove manual pkgconf build and update GHC and Cabal #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c32015
chore(cabal_build_tests): remove manual pkgconf build, update GHC to …
ArturWieczorek Apr 30, 2025
793bfa3
Merge branch 'master' into artur/update_cabal_build_tests
ArturWieczorek May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions cabal_build_tests/fedora/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

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

CMD ./install-node.sh $TAGGED_VERSION
4 changes: 2 additions & 2 deletions cabal_build_tests/install-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# Please note: 'source ~/.bashrc' cmd is not used because Docker runs this script as subscript

# Versions
GHC_VERSION="9.6.3"
CABAL_VERSION="3.10.2.0"
GHC_VERSION="9.6.7"
CABAL_VERSION="3.12.1.0"

echo ""

Expand Down