From 26e2a8289117cfd09f1826a146bb95023f0474c4 Mon Sep 17 00:00:00 2001 From: Emma Turner Date: Wed, 26 Feb 2025 10:57:56 +0000 Subject: [PATCH] SDK/rust: ensure ci deps are correct --- .gitlab/ci/pipelines/before_merging.yml | 15 ++++++++++++++- .gitlab/ci/pipelines/merge_train.yml | 15 ++++++++++++++- ci/bin/common.ml | 19 ++++++++++++++----- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index e4310beb2b89..3429cc7aee3e 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -1417,6 +1417,8 @@ etherlink.build:static-x86_64: - .gitlab/**/* - Makefile - etherlink/**/* + - sdk/rust/**/* + - src/kernel_sdk/**/* when: manual allow_failure: true dependencies: @@ -1469,6 +1471,8 @@ etherlink.build:static-arm64: - .gitlab/**/* - Makefile - etherlink/**/* + - sdk/rust/**/* + - src/kernel_sdk/**/* when: manual allow_failure: true dependencies: @@ -3299,7 +3303,7 @@ test_sdk_rust: - .gitlab-ci.yml - .gitlab/**/* - images/**/* - - sdk/rust + - sdk/rust/**/* when: on_success needs: - job: oc.docker:rust-toolchain:amd64 @@ -3359,6 +3363,7 @@ test_kernels: - .gitlab/**/* - images/**/* - kernels.mk + - sdk/rust/**/* - src/kernel_*/**/* when: on_success needs: @@ -3402,6 +3407,7 @@ test_etherlink_kernel: - etherlink.mk - etherlink/**/*.rs - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* when: on_success needs: @@ -3484,6 +3490,7 @@ audit_riscv_deps: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3522,6 +3529,7 @@ check_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3563,6 +3571,7 @@ test_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3604,6 +3613,7 @@ test_long_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3645,6 +3655,7 @@ test_miri_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3818,6 +3829,8 @@ oc.unit:etherlink-x86_64: - .gitlab/**/* - Makefile - etherlink/**/* + - sdk/rust/**/* + - src/kernel_sdk/**/* when: on_success needs: - oc.docker:ci:amd64 diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 50c27a2814d0..c18c33af87b8 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -1416,6 +1416,8 @@ etherlink.build:static-x86_64: - .gitlab/**/* - Makefile - etherlink/**/* + - sdk/rust/**/* + - src/kernel_sdk/**/* when: manual allow_failure: true dependencies: @@ -1468,6 +1470,8 @@ etherlink.build:static-arm64: - .gitlab/**/* - Makefile - etherlink/**/* + - sdk/rust/**/* + - src/kernel_sdk/**/* when: manual allow_failure: true dependencies: @@ -3298,7 +3302,7 @@ test_sdk_rust: - .gitlab-ci.yml - .gitlab/**/* - images/**/* - - sdk/rust + - sdk/rust/**/* when: on_success needs: - job: oc.docker:rust-toolchain:amd64 @@ -3358,6 +3362,7 @@ test_kernels: - .gitlab/**/* - images/**/* - kernels.mk + - sdk/rust/**/* - src/kernel_*/**/* when: on_success needs: @@ -3401,6 +3406,7 @@ test_etherlink_kernel: - etherlink.mk - etherlink/**/*.rs - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* when: on_success needs: @@ -3483,6 +3489,7 @@ audit_riscv_deps: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3521,6 +3528,7 @@ check_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3562,6 +3570,7 @@ test_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3603,6 +3612,7 @@ test_long_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3644,6 +3654,7 @@ test_miri_riscv_kernels: - .gitlab-ci.yml - .gitlab/**/* - images/**/* + - sdk/rust/**/* - src/kernel_sdk/**/* - src/riscv/**/* when: on_success @@ -3817,6 +3828,8 @@ oc.unit:etherlink-x86_64: - .gitlab/**/* - Makefile - etherlink/**/* + - sdk/rust/**/* + - src/kernel_sdk/**/* when: on_success needs: - oc.docker:ci:amd64 diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 8206d0f80c9a..abcb1bcec964 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -336,7 +336,10 @@ let changeset_octez = (* Only if Etherlink has changed *) let changeset_etherlink = - Changeset.(changeset_base @ make ["etherlink/**/*"; "Makefile"]) + Changeset.( + changeset_base + @ make + ["etherlink/**/*"; "Makefile"; "src/kernel_sdk/**/*"; "sdk/rust/**/*"]) (** Only if octez source code has changed, if the images has changed or if kernels.mk changed. *) @@ -565,19 +568,25 @@ let changeset_test_sdk_rust = Changeset.( changeset_base @ changeset_images (* Run if the [rust-toolchain] image is updated *) - @ make ["sdk/rust"]) + @ make ["sdk/rust/**/*"]) let changeset_test_kernels = Changeset.( changeset_base @ changeset_images (* Run if the [rust-toolchain] image is updated *) - @ make ["kernels.mk"; "src/kernel_*/**/*"]) + @ make ["kernels.mk"; "src/kernel_*/**/*"; "sdk/rust/**/*"]) let changeset_test_etherlink_kernel = Changeset.( changeset_base @ changeset_images (* Run if the [rust-toolchain] image is updated *) - @ make ["etherlink.mk"; "etherlink/**/*.rs"; "src/kernel_sdk/**/*"]) + @ make + [ + "etherlink.mk"; + "etherlink/**/*.rs"; + "src/kernel_sdk/**/*"; + "sdk/rust/**/*"; + ]) let changeset_test_etherlink_firehose = Changeset.( @@ -592,7 +601,7 @@ let changeset_riscv_kernels = Changeset.( changeset_base @ changeset_images (* Run if the [rust-toolchain] image is updated *) - @ make ["src/kernel_sdk/**/*"; "src/riscv/**/*"]) + @ make ["sdk/rust/**/*"; "src/kernel_sdk/**/*"; "src/riscv/**/*"]) let changeset_test_evm_compatibility = Changeset.( -- GitLab