From 7522a22c38cce59ec36cf59a604cf7af828f4af7 Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Tue, 12 Nov 2024 16:21:37 +0100 Subject: [PATCH 1/2] Update to GHC 9.6.6 --- .github/workflows/ci.yaml | 4 ++-- ChangeLog.md | 1 + deps/concordium-base | 2 +- scripts/distributables/linux-concordium-client.Jenkinsfile | 2 +- .../linux-distributable-concordium-client.Dockerfile | 4 ++-- scripts/distributables/macos-concordium-client.Jenkinsfile | 4 ++-- .../distributables/windows-concordium-client.Jenkinsfile | 4 ++-- stack.linux-static.yaml | 6 +++++- stack.yaml | 6 +++++- 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8e556aa9..3897d7eb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,8 +33,8 @@ on: workflow_dispatch: # allow manual trigger env: - RUST: 1.73 - GHC: 9.6.4 + RUST: 1.82 + GHC: 9.6.6 jobs: fourmolu: diff --git a/ChangeLog.md b/ChangeLog.md index 99fefa86..916ede14 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,6 +6,7 @@ - Add command `consensus detailed-status` for getting detailed consensus status (from protocol version 6). - Add `raw GetConsensusDetailedStatus` that presents the detailed consensus status as JSON. +- Update GHC version to 9.6.6 (lts-22.39). ## 7.0.1 diff --git a/deps/concordium-base b/deps/concordium-base index 81c5f9dc..414fb4d6 160000 --- a/deps/concordium-base +++ b/deps/concordium-base @@ -1 +1 @@ -Subproject commit 81c5f9dc2c61c8de342057ce6c12d02e9d5223a7 +Subproject commit 414fb4d63616fe351975e08bf147e80256991a0e diff --git a/scripts/distributables/linux-concordium-client.Jenkinsfile b/scripts/distributables/linux-concordium-client.Jenkinsfile index 31da11b2..5e1c9dc1 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.6.4' + GHC_VERSION = '9.6.6' VERSION = sh( returnStdout: true, script: '''\ diff --git a/scripts/distributables/linux-distributable-concordium-client.Dockerfile b/scripts/distributables/linux-distributable-concordium-client.Dockerfile index 1121700f..94676955 100644 --- a/scripts/distributables/linux-distributable-concordium-client.Dockerfile +++ b/scripts/distributables/linux-distributable-concordium-client.Dockerfile @@ -10,10 +10,10 @@ COPY . /build RUN apk add perl g++ make protoc ncurses ncurses-dev zlib zlib-static zlib-dev git wget postgresql-dev gmp-dev gmp xz -ARG RUST_VERSION=1.73 +ARG RUST_VERSION=1.82 RUN wget -qO - https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain ${RUST_VERSION} -y -ARG GHC_VERSION=9.6.4 +ARG GHC_VERSION=9.6.6 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 && \ diff --git a/scripts/distributables/macos-concordium-client.Jenkinsfile b/scripts/distributables/macos-concordium-client.Jenkinsfile index 088d3456..6a56e9c0 100644 --- a/scripts/distributables/macos-concordium-client.Jenkinsfile +++ b/scripts/distributables/macos-concordium-client.Jenkinsfile @@ -1,8 +1,8 @@ pipeline { agent { label 'jenkins-worker' } environment { - GHC_VERSION = '9.6.4' - RUST_VERSION = '1.73' + GHC_VERSION = '9.6.6' + RUST_VERSION = '1.82' VERSION = sh( returnStdout: true, script: '''\ diff --git a/scripts/distributables/windows-concordium-client.Jenkinsfile b/scripts/distributables/windows-concordium-client.Jenkinsfile index e92f4cbe..785e2562 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.6.4' + GHC_VERSION = '9.6.6' BASE_OUTFILE = 's3://distribution.concordium.software/tools/windows/concordium-client' } steps { @@ -22,7 +22,7 @@ pipeline { fi # Ensure correct rust env - rustup default 1.73-x86_64-pc-windows-gnu + rustup default 1.82-x86_64-pc-windows-gnu # Build project stack build --force-dirty diff --git a/stack.linux-static.yaml b/stack.linux-static.yaml index 4385ee23..51ab8bd6 100644 --- a/stack.linux-static.yaml +++ b/stack.linux-static.yaml @@ -1,4 +1,4 @@ -resolver: lts-22.9 +resolver: lts-22.39 packages: - . @@ -18,6 +18,10 @@ extra-deps: - proto-lens-setup-0.4.0.7@sha256:acca0b04e033ea0a017f809d91a7dbc942e025ec6bc275fa21647352722c74cc,3122 - proto-lens-protoc-0.8.0.0@sha256:a146ee8c9af9e445ab05651e688deb0ff849357d320657d6cea5be33cb54b960,2235 - ghc-source-gen-0.4.4.0@sha256:8499f23c5989c295f3b002ad92784ca5fed5260fd4891dc816f17d30c5ba9cd9,4236 +# Cabal-3.10.3.0 (from the lts-22.39 snapshot) breaks linking on Windows, but this should be +# fixed in newer versions. This should be removed once we update to an lts that uses a new +# enough version of Cabal. +- Cabal-3.10.1.0 - ./deps/concordium-base diff --git a/stack.yaml b/stack.yaml index deaf9504..4b17f895 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-22.9 +resolver: lts-22.39 # User packages to be built. # Various formats can be used as shown in the example below. @@ -54,6 +54,10 @@ extra-deps: - proto-lens-setup-0.4.0.7@sha256:acca0b04e033ea0a017f809d91a7dbc942e025ec6bc275fa21647352722c74cc,3122 - proto-lens-protoc-0.8.0.0@sha256:a146ee8c9af9e445ab05651e688deb0ff849357d320657d6cea5be33cb54b960,2235 - ghc-source-gen-0.4.4.0@sha256:8499f23c5989c295f3b002ad92784ca5fed5260fd4891dc816f17d30c5ba9cd9,4236 +# Cabal-3.10.3.0 (from the lts-22.39 snapshot) breaks linking on Windows, but this should be +# fixed in newer versions. This should be removed once we update to an lts that uses a new +# enough version of Cabal. +- Cabal-3.10.1.0 - ./deps/concordium-base From 554a0da45ae106921450920898f9267fb4732b38 Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Wed, 20 Nov 2024 16:07:00 +0100 Subject: [PATCH 2/2] Update base --- deps/concordium-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/concordium-base b/deps/concordium-base index 414fb4d6..58f871e5 160000 --- a/deps/concordium-base +++ b/deps/concordium-base @@ -1 +1 @@ -Subproject commit 414fb4d63616fe351975e08bf147e80256991a0e +Subproject commit 58f871e57ab8543ae499d3cccc14ff7ce7b4842a