From 224bd26aa9946298f61fc5b1fa08fbdbeae7fb34 Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Tue, 9 Apr 2024 14:19:25 +0200 Subject: [PATCH 1/4] Update rust version to 1.73 --- .github/workflows/ci.yaml | 2 +- README.md | 4 ++-- concordium-client.cabal | 2 +- deps/concordium-base | 2 +- .../linux-distributable-concordium-client.Dockerfile | 2 +- .../macos-concordium-client.Jenkinsfile | 2 +- .../windows-concordium-client.Jenkinsfile | 12 ++++++------ 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 23582f55..d7b55a93 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ on: workflow_dispatch: # allow manual trigger env: - RUST: 1.68 + RUST: 1.73 GHC: 9.6.4 jobs: diff --git a/README.md b/README.md index 7f97066c..47d84ea3 100644 --- a/README.md +++ b/README.md @@ -50,14 +50,14 @@ To build the tool from source, you need the following prerequisites: - Unix: `curl -sSL https://get.haskellstack.org/ | sh` - Windows: [Follow the Stack install guide](https://docs.haskellstack.org/en/stable/install_and_upgrade/). -- Install Rust version 1.68+: +- Install Rust version 1.73+: - Unix: `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh` - Windows: [Follow the Rust install guide](https://www.rust-lang.org/tools/install) - Use the `x86_64-pc-windows-gnu` toolchain by choosing it during installation or by running `rustup toolchain default stable-x86_64-pc-windows-gnu`. - - *Recommended after installing: Set the default Rust version to 1.68 by running `rustup default 1.68`*. + - *Recommended after installing: Set the default Rust version to 1.73 by running `rustup default 1.73`*. - Install the [protoc](https://github.com/google/proto-lens/blob/master/docs/installing-protoc.md) tool for generating protobuf files: - MacOS: `brew install protobuf` diff --git a/concordium-client.cabal b/concordium-client.cabal index 9f09660a..823be579 100644 --- a/concordium-client.cabal +++ b/concordium-client.cabal @@ -5,7 +5,7 @@ cabal-version: 1.24 -- see: https://github.com/sol/hpack name: concordium-client -version: 6.3.0 +version: 6.2.1 description: Please see the README on GitHub at homepage: https://github.com/Concordium/concordium-client#readme bug-reports: https://github.com/Concordium/concordium-client/issues diff --git a/deps/concordium-base b/deps/concordium-base index 290a4b78..9b409fe3 160000 --- a/deps/concordium-base +++ b/deps/concordium-base @@ -1 +1 @@ -Subproject commit 290a4b78496abaab2ce90c49442dc9e369b2b354 +Subproject commit 9b409fe38b9d4a15675f3b20e3d965b10f31db50 diff --git a/scripts/distributables/linux-distributable-concordium-client.Dockerfile b/scripts/distributables/linux-distributable-concordium-client.Dockerfile index dcd9efe5..1121700f 100644 --- a/scripts/distributables/linux-distributable-concordium-client.Dockerfile +++ b/scripts/distributables/linux-distributable-concordium-client.Dockerfile @@ -10,7 +10,7 @@ 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.68 +ARG RUST_VERSION=1.73 RUN wget -qO - https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain ${RUST_VERSION} -y ARG GHC_VERSION=9.6.4 diff --git a/scripts/distributables/macos-concordium-client.Jenkinsfile b/scripts/distributables/macos-concordium-client.Jenkinsfile index faedbd3a..088d3456 100644 --- a/scripts/distributables/macos-concordium-client.Jenkinsfile +++ b/scripts/distributables/macos-concordium-client.Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { label 'jenkins-worker' } environment { GHC_VERSION = '9.6.4' - RUST_VERSION = '1.68' + RUST_VERSION = '1.73' VERSION = sh( returnStdout: true, script: '''\ diff --git a/scripts/distributables/windows-concordium-client.Jenkinsfile b/scripts/distributables/windows-concordium-client.Jenkinsfile index b3e7ce79..702636c9 100644 --- a/scripts/distributables/windows-concordium-client.Jenkinsfile +++ b/scripts/distributables/windows-concordium-client.Jenkinsfile @@ -12,7 +12,7 @@ pipeline { # Extract version number from package.yaml, if not set as parameter [ -z "$VERSION" ] && VERSION=$(awk '/version: / { print $2; exit }' package.yaml) - OUTFILE="${BASE_OUTFILE}_${VERSION}.exe" + OUTFILE="${BASE_OUTFILE}_${VERSION}.zip" # Fail if file already exists totalFoundObjects=$(aws s3 ls ${OUTFILE} --summarize | grep "Total Objects: " | sed 's/[^0-9]*//g') @@ -22,18 +22,18 @@ pipeline { fi # Ensure correct rust env - rustup default 1.68-x86_64-pc-windows-gnu + rustup default 1.73-x86_64-pc-windows-gnu # Build project stack build --force-dirty mkdir out - - # Find executable - cp $(find $PWD/.stack-work/install -type f -name "concordium-client.exe") out/ + binDir=$(stack path --local-install-root)/bin + outDir=$(pwd)/out + (cd $binDir && zip $outDir/concordium-client.zip concordium-client.exe concordium_base.dll sha_2.dll) # Push to s3 - aws s3 cp out/concordium-client.exe ${OUTFILE} --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers + aws s3 cp out/concordium-client.zip ${OUTFILE} --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers '''.stripIndent() } } From b88c36c3b89f3c342330b172ff75c4421d63081f Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Tue, 9 Apr 2024 17:10:53 +0200 Subject: [PATCH 2/4] User powershell to zip --- scripts/distributables/windows-concordium-client.Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/distributables/windows-concordium-client.Jenkinsfile b/scripts/distributables/windows-concordium-client.Jenkinsfile index 702636c9..8936691b 100644 --- a/scripts/distributables/windows-concordium-client.Jenkinsfile +++ b/scripts/distributables/windows-concordium-client.Jenkinsfile @@ -27,10 +27,11 @@ pipeline { # Build project stack build --force-dirty + # Zip the binaries mkdir out binDir=$(stack path --local-install-root)/bin - outDir=$(pwd)/out - (cd $binDir && zip $outDir/concordium-client.zip concordium-client.exe concordium_base.dll sha_2.dll) + (cd $binDir && powershell -Command "Compress-Archive -Path concordium-client.exe,concordium_base.dll,sha_2.dll -DestinationPath concordium-client.zip) + mv -f $binDir/concordium-client.zip out/concordium-client.zip # Push to s3 aws s3 cp out/concordium-client.zip ${OUTFILE} --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers From 42756c41623889cac9a39cb40ee1b33b2d70b003 Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Thu, 11 Apr 2024 12:55:07 +0200 Subject: [PATCH 3/4] Missing " --- scripts/distributables/windows-concordium-client.Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/distributables/windows-concordium-client.Jenkinsfile b/scripts/distributables/windows-concordium-client.Jenkinsfile index 8936691b..e92f4cbe 100644 --- a/scripts/distributables/windows-concordium-client.Jenkinsfile +++ b/scripts/distributables/windows-concordium-client.Jenkinsfile @@ -30,7 +30,7 @@ pipeline { # Zip the binaries mkdir out binDir=$(stack path --local-install-root)/bin - (cd $binDir && powershell -Command "Compress-Archive -Path concordium-client.exe,concordium_base.dll,sha_2.dll -DestinationPath concordium-client.zip) + (cd $binDir && powershell -Command "Compress-Archive -Path concordium-client.exe,concordium_base.dll,sha_2.dll -DestinationPath concordium-client.zip") mv -f $binDir/concordium-client.zip out/concordium-client.zip # Push to s3 From 7b1c5e5605b4d2dd83e94fc39c01403ec3c74440 Mon Sep 17 00:00:00 2001 From: Thomas Dinsdale-Young Date: Mon, 13 May 2024 11:17:13 +0200 Subject: [PATCH 4/4] Update changelog. --- ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.md b/ChangeLog.md index 2a2d3de5..f382e81e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,6 +3,7 @@ ## Unreleased - Update GHC version to 9.6.4 (lts-22.9). +- Update Rust version to 1.73. - Support protocol version 7. ## 6.2.1