From dc3a7873f9eab158d68e5b0b3a52a4ed8784382d Mon Sep 17 00:00:00 2001 From: Marcin Date: Tue, 8 Oct 2024 08:48:25 +0200 Subject: [PATCH 1/2] Bumped spec_version, node version, runtime version. Fixed e2e check --- .github/scripts/run_consensus.sh | 4 ++-- Cargo.lock | 4 ++-- bin/node/Cargo.toml | 2 +- bin/runtime/Cargo.toml | 2 +- bin/runtime/src/lib.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/scripts/run_consensus.sh b/.github/scripts/run_consensus.sh index b3870e6365..6998fee3c7 100755 --- a/.github/scripts/run_consensus.sh +++ b/.github/scripts/run_consensus.sh @@ -122,7 +122,7 @@ function run_containers() { for index in $(seq 0 "${authorities_count}"); do containers+=("Node${index}") done - docker-compose $(get_compose_file_list "${docker_compose_file}" "${override_file}") up -d "${containers[@]}" + docker compose $(get_compose_file_list "${docker_compose_file}" "${override_file}") up -d "${containers[@]}" } function archive_logs() { @@ -137,7 +137,7 @@ function archive_logs() { pushd $(mktemp -d) > /dev/null for index in $(seq 0 "${node_count}"); do echo "Archiving "Node${index}" logs..." - docker-compose ${compose_file_list} logs --no-color --no-log-prefix "Node${index}" > "Node${index}.log" + docker compose ${compose_file_list} logs --no-color --no-log-prefix "Node${index}" > "Node${index}.log" done tar -czf "${tarball_output}" Node* popd > /dev/null diff --git a/Cargo.lock b/Cargo.lock index 8e90e62341..4e1211c888 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,7 +346,7 @@ dependencies = [ [[package]] name = "aleph-node" -version = "0.13.3" +version = "0.13.4" dependencies = [ "aleph-runtime", "finality-aleph", @@ -405,7 +405,7 @@ dependencies = [ [[package]] name = "aleph-runtime" -version = "0.13.3" +version = "0.13.4" dependencies = [ "baby-liminal-extension", "frame-benchmarking", diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml index c9f480141f..a57819fd09 100644 --- a/bin/node/Cargo.toml +++ b/bin/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aleph-node" -version = "0.13.3" +version = "0.13.4" description = "Aleph node binary" build = "build.rs" license = "GPL-3.0-or-later" diff --git a/bin/runtime/Cargo.toml b/bin/runtime/Cargo.toml index 6e47710ef8..8262aefbd3 100644 --- a/bin/runtime/Cargo.toml +++ b/bin/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aleph-runtime" -version = "0.13.3" +version = "0.13.4" license = "GPL-3.0-or-later" authors.workspace = true edition.workspace = true diff --git a/bin/runtime/src/lib.rs b/bin/runtime/src/lib.rs index 901dba6236..ff82ac236b 100644 --- a/bin/runtime/src/lib.rs +++ b/bin/runtime/src/lib.rs @@ -97,7 +97,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("aleph-node"), impl_name: create_runtime_str!("aleph-node"), authoring_version: 1, - spec_version: 73, + spec_version: 74, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 18, From 1784511295317fd3af39b6afffe4dcdb74666bfd Mon Sep 17 00:00:00 2001 From: Marcin Date: Tue, 21 May 2024 11:08:31 +0000 Subject: [PATCH 2/2] L1-223 Rework check PR title (#1737) * Incorporate `check PR title` job into main PR pipeline. * Use of https://github.com/Cardinal-Cryptography/github-actions/pull/53 PR Please delete options that are not relevant. - New feature (non-breaking change which adds functionality) https://github.com/Cardinal-Cryptography/aleph-node/actions/runs/9157713305/job/25174644543 --- .github/workflows/on-pull-request-change.yml | 28 -------------------- .github/workflows/on-pull-request-commit.yml | 10 +++++++ 2 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/on-pull-request-change.yml diff --git a/.github/workflows/on-pull-request-change.yml b/.github/workflows/on-pull-request-change.yml deleted file mode 100644 index 28bccf474d..0000000000 --- a/.github/workflows/on-pull-request-change.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: Check PR - -on: - pull_request: - types: - - opened - - edited - - reopened - - ready_for_review - -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true - -jobs: - main: - name: Check PR title - runs-on: ubuntu-20.04 - steps: - - name: GIT | Checkout - uses: actions/checkout@v4 - - - name: VALIDATE | Check PR title - # yamllint disable-line rule:line-length - uses: Cardinal-Cryptography/github-actions/check-pr-title@v4 - with: - pr-title: ${{ github.event.pull_request.title }} diff --git a/.github/workflows/on-pull-request-commit.yml b/.github/workflows/on-pull-request-commit.yml index 00b7560e88..a8a9d4222e 100644 --- a/.github/workflows/on-pull-request-commit.yml +++ b/.github/workflows/on-pull-request-commit.yml @@ -13,6 +13,16 @@ concurrency: cancel-in-progress: true jobs: + check-pr-title: + name: Check PR title + runs-on: ubuntu-20.04 + steps: + - name: Check PR title + uses: Cardinal-Cryptography/github-actions/check-pr-title@v7 + with: + pr-title: ${{ github.event.pull_request.title }} + regexp: '(A0|L1)-[0-9]+' + run-liminal-ci-cd: if: contains(github.event.pull_request.labels.*.name, 'liminal-CI') name: Run liminal checks on PR