Skip to content

Commit

Permalink
Merge pull request #1256 from Concordium/update-rust-haskell
Browse files Browse the repository at this point in the history
Update Rust and Haskell versions
  • Loading branch information
td202 authored Nov 13, 2024
2 parents c41af00 + 7d1cdec commit 4805ac4
Show file tree
Hide file tree
Showing 32 changed files with 2,200 additions and 1,369 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ jobs:
strategy:
matrix:
plan:
- rust: 1.73
ghc: 9.6.4
- rust: 1.82
ghc: 9.6.6

steps:
- name: Remove unnecessary files
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ on:

env:
UBUNTU_VERSION: '20.04'
STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.73.0_ghc-9.6.4'
RUST_VERSION: '1.73'
STACK_VERSION: '2.13.1'
STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.82_ghc-9.6.6-0'
RUST_VERSION: '1.82'
STACK_VERSION: '3.1.1'
FLATBUFFERS_VERSION: '23.5.26'
GHC_VERSION: '9.6.4'
PROTOC_VERSION: '25.2'
GHC_VERSION: '9.6.6'
PROTOC_VERSION: '28.3'
STATIC_NODE_BINARY_IMAGE_NAME: 'static-node-binaries'
AWS_ROLE_TO_ASSUME: 'arn:aws:iam::192549843005:role/github_concordium-node'
S3_ARN_TEMPLATES: '{
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
- Add support for suspend/resume to validator configuration updates.
- Add `GetConsensusDetailedStatus` gRPC endpoint for getting detailed information on the status
of the consensus, at consensus version 1.
- Update Rust version to 1.82.
- Update GHC version to 9.6.6 (LTS-22.39).

## 7.0.5

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ issues.

## Rust workflow

We use **stable version** of rust, 1.73, to compile the code.
We use **stable version** of rust, 1.82, to compile the code.

The CI is configured to check two things
- the [clippy](https://github.com/rust-lang/rust-clippy) tool is run to check
Expand Down
Loading

0 comments on commit 4805ac4

Please sign in to comment.