diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index d7b656309..32700f89c 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -169,9 +169,10 @@ jobs: components: clippy, llvm-tools target: x86_64-pc-windows-gnu # Install tool for code coverage reporting. + # Version cargo-llvm-cov 0.6.22 requries Rust 1.87, so we use 0.6.21 for now - name: Install cargo-llvm-cov run: | - cargo install cargo-llvm-cov --locked + cargo install cargo-llvm-cov --version 0.6.21 --locked - name: Cache cargo dependencies and targets uses: actions/cache@v4 with: diff --git a/.github/workflows/collector-backend-release.yaml b/.github/workflows/collector-backend-release.yaml index 0a0a04e9d..b4aea254d 100644 --- a/.github/workflows/collector-backend-release.yaml +++ b/.github/workflows/collector-backend-release.yaml @@ -5,11 +5,10 @@ on: jobs: release-collector-backend: - uses: concordium/.github/.github/workflows/docker-release-workflow.yaml@main + uses: concordium/.github/.github/workflows/docker-release-workflow.yaml@v1 with: SERVICE_NAME: "collector-backend" BUILD_ARGS: | base_image_tag="latest" DOCKER_FILE_PATH: collector-backend/Dockerfile CARGO_FILE_PATH: collector-backend/Cargo.toml - AWS_ROLE: "arn:aws:iam::192549843005:role/github_collector-backend" diff --git a/concordium-base b/concordium-base index e1b1814de..ee6dcfe88 160000 --- a/concordium-base +++ b/concordium-base @@ -1 +1 @@ -Subproject commit e1b1814de2d1e6b27a0ca5dcc058366718f09371 +Subproject commit ee6dcfe88676424804f13db1701a015a61148aba diff --git a/concordium-consensus/tests/consensus/ConcordiumTests/KonsensusV1/TransactionProcessingTest.hs b/concordium-consensus/tests/consensus/ConcordiumTests/KonsensusV1/TransactionProcessingTest.hs index 16379c2bc..478aa7188 100644 --- a/concordium-consensus/tests/consensus/ConcordiumTests/KonsensusV1/TransactionProcessingTest.hs +++ b/concordium-consensus/tests/consensus/ConcordiumTests/KonsensusV1/TransactionProcessingTest.hs @@ -1273,4 +1273,3 @@ tests = describe "KonsensusV1.TransactionProcessing" $ do describe "P10" $ do describe "ExtendedTransaction verification" $ testExtendedTransactionVerification SP10 - diff --git a/concordium-node/Cargo.lock b/concordium-node/Cargo.lock index 3c42b7ca1..7db201250 100644 --- a/concordium-node/Cargo.lock +++ b/concordium-node/Cargo.lock @@ -757,7 +757,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "9.0.0" +version = "10.0.0-alpha.0" dependencies = [ "aes", "anyhow", diff --git a/plt-deployment-unit/Cargo.lock b/plt-deployment-unit/Cargo.lock index 56e8a3cf1..07e11a8f7 100644 --- a/plt-deployment-unit/Cargo.lock +++ b/plt-deployment-unit/Cargo.lock @@ -365,7 +365,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "9.0.0" +version = "10.0.0-alpha.0" dependencies = [ "anyhow", "ark-bls12-381",