diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c0d58a60..23582f55 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,7 +34,7 @@ on: env: RUST: 1.68 - GHC: 9.2.7 + GHC: 9.6.4 jobs: fourmolu: diff --git a/scripts/distributables/linux-concordium-client.Jenkinsfile b/scripts/distributables/linux-concordium-client.Jenkinsfile index 49b59f3a..0712538e 100644 --- a/scripts/distributables/linux-concordium-client.Jenkinsfile +++ b/scripts/distributables/linux-concordium-client.Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any environment { - GHC_VERSION = '9.2.7' + GHC_VERSION = '9.6.4' VERSION = sh( returnStdout: true, script: '''\ diff --git a/scripts/distributables/linux-distributable-concordium-client.Dockerfile b/scripts/distributables/linux-distributable-concordium-client.Dockerfile index 2d87a82a..ffd6ca16 100644 --- a/scripts/distributables/linux-distributable-concordium-client.Dockerfile +++ b/scripts/distributables/linux-distributable-concordium-client.Dockerfile @@ -10,7 +10,7 @@ RUN apk add perl g++ make protoc ncurses ncurses-dev zlib zlib-static zlib-dev g ARG RUST_VERSION=1.68 RUN wget -qO - https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain ${RUST_VERSION} -y -ARG GHC_VERSION=9.2.7 +ARG GHC_VERSION=9.6.4 RUN wget -q https://s3-eu-west-1.amazonaws.com/static-libraries.concordium.com/ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz && \ tar -xf ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz && \ cd ghc-${GHC_VERSION}-x86_64-unknown-linux && \ @@ -19,7 +19,7 @@ RUN wget -q https://s3-eu-west-1.amazonaws.com/static-libraries.concordium.com/g cd .. && \ rm -rf ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz ghc-${GHC_VERSION}-x86_64-unknown-linux -ARG STACK_VERSION=2.9.1 +ARG STACK_VERSION=2.13.1 RUN wget -q https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/stack-${STACK_VERSION}-linux-x86_64.tar.gz && \ tar -xf stack-${STACK_VERSION}-linux-x86_64.tar.gz && \ mkdir -p $HOME/.stack/bin && \ diff --git a/scripts/distributables/macos-concordium-client.Jenkinsfile b/scripts/distributables/macos-concordium-client.Jenkinsfile index bfb7a382..faedbd3a 100644 --- a/scripts/distributables/macos-concordium-client.Jenkinsfile +++ b/scripts/distributables/macos-concordium-client.Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { label 'jenkins-worker' } environment { - GHC_VERSION = '9.2.7' + GHC_VERSION = '9.6.4' RUST_VERSION = '1.68' VERSION = sh( returnStdout: true, diff --git a/scripts/distributables/windows-concordium-client.Jenkinsfile b/scripts/distributables/windows-concordium-client.Jenkinsfile index b32c41b0..b3e7ce79 100644 --- a/scripts/distributables/windows-concordium-client.Jenkinsfile +++ b/scripts/distributables/windows-concordium-client.Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stages { stage('build') { environment { - GHC_VERSION = '9.2.7' + GHC_VERSION = '9.6.4' BASE_OUTFILE = 's3://distribution.concordium.software/tools/windows/concordium-client' } steps {