From 52aa1d579630f5ae2a109163d268eaf8a85fae70 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Thu, 5 Dec 2024 15:27:02 +0100 Subject: [PATCH 1/2] rpm packages: change the name of a variable --- ci/bin/rpm_repository.ml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/bin/rpm_repository.ml b/ci/bin/rpm_repository.ml index bf18e75a3428..2f4cd54db45d 100644 --- a/ci/bin/rpm_repository.ml +++ b/ci/bin/rpm_repository.ml @@ -58,8 +58,7 @@ let jobs pipeline_type = "${GCP_PROTECTED_REGISTRY}/tezos/tezos/build-$DISTRIBUTION-$RELEASE" ) :: add in - let make_job_docker_build_rockylinux_dependencies ~__POS__ ~name ~matrix - ~distribution = + let make_job_docker_build_dependencies ~__POS__ ~name ~matrix ~distribution = job_docker_authenticated ~__POS__ ~name @@ -70,14 +69,14 @@ let jobs pipeline_type = ["./scripts/ci/build-packages-dependencies.sh rpm-deps-build.Dockerfile"] in let job_docker_build_rockylinux_dependencies : tezos_job = - make_job_docker_build_rockylinux_dependencies + make_job_docker_build_dependencies ~__POS__ ~name:"oc.docker-build-rockylinux-dependencies" ~distribution:"rockylinux" ~matrix:(rockylinux_package_release_matrix pipeline_type) in let job_docker_build_fedora_dependencies : tezos_job = - make_job_docker_build_rockylinux_dependencies + make_job_docker_build_dependencies ~__POS__ ~name:"oc.docker-build-fedora-dependencies" ~distribution:"fedora" -- GitLab From 5e7c4651b9afe61da7450cde9a76182d99bf47a6 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Thu, 5 Dec 2024 15:41:34 +0100 Subject: [PATCH 2/2] ciao: rebuild packages images when version.sh or manifest is updated --- .gitlab/ci/pipelines/before_merging.yml | 6 ++++++ .gitlab/ci/pipelines/merge_train.yml | 6 ++++++ ci/bin/common.ml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index e9e8db7bbe94..62cc1ced660b 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -2106,6 +2106,7 @@ trigger:debian_repository_partial_auto: - debian-deps-build.Dockerfile - docs/introduction/install-bin-deb.sh - docs/introduction/upgrade-bin-deb.sh + - manifest/**/*.ml* - scripts/ci/build-debian-packages.sh - scripts/ci/build-debian-packages_current.sh - scripts/ci/build-packages-dependencies.sh @@ -2114,6 +2115,7 @@ trigger:debian_repository_partial_auto: - scripts/packaging/Release.conf - scripts/packaging/build-deb-local.sh - scripts/packaging/octez/debian/* + - scripts/version.sh when: on_success needs: - job: trigger @@ -2144,6 +2146,7 @@ trigger:rpm_repository_partial_auto: stage: test rules: - changes: + - manifest/**/*.ml* - rpm-deps-build.Dockerfile - scripts/ci/build-packages-dependencies.sh - scripts/ci/build-rpm-packages.sh @@ -2152,6 +2155,7 @@ trigger:rpm_repository_partial_auto: - scripts/packaging/build-deb-local.sh - scripts/packaging/octez/rpm/* - scripts/packaging/tests/rpm/* + - scripts/version.sh when: on_success needs: - job: trigger @@ -2182,11 +2186,13 @@ trigger:homebrew_auto: stage: test rules: - changes: + - manifest/**/*.ml* - scripts/ci/install-gsutil.sh - scripts/packaging/Formula/* - scripts/packaging/homebrew_install.sh - scripts/packaging/homebrew_release.sh - scripts/packaging/test_homebrew_install.sh + - scripts/version.sh when: on_success needs: - job: trigger diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 972f52817d44..6d314917a429 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -2105,6 +2105,7 @@ trigger:debian_repository_partial_auto: - debian-deps-build.Dockerfile - docs/introduction/install-bin-deb.sh - docs/introduction/upgrade-bin-deb.sh + - manifest/**/*.ml* - scripts/ci/build-debian-packages.sh - scripts/ci/build-debian-packages_current.sh - scripts/ci/build-packages-dependencies.sh @@ -2113,6 +2114,7 @@ trigger:debian_repository_partial_auto: - scripts/packaging/Release.conf - scripts/packaging/build-deb-local.sh - scripts/packaging/octez/debian/* + - scripts/version.sh when: on_success needs: - job: trigger @@ -2143,6 +2145,7 @@ trigger:rpm_repository_partial_auto: stage: test rules: - changes: + - manifest/**/*.ml* - rpm-deps-build.Dockerfile - scripts/ci/build-packages-dependencies.sh - scripts/ci/build-rpm-packages.sh @@ -2151,6 +2154,7 @@ trigger:rpm_repository_partial_auto: - scripts/packaging/build-deb-local.sh - scripts/packaging/octez/rpm/* - scripts/packaging/tests/rpm/* + - scripts/version.sh when: on_success needs: - job: trigger @@ -2181,11 +2185,13 @@ trigger:homebrew_auto: stage: test rules: - changes: + - manifest/**/*.ml* - scripts/ci/install-gsutil.sh - scripts/packaging/Formula/* - scripts/packaging/homebrew_install.sh - scripts/packaging/homebrew_release.sh - scripts/packaging/test_homebrew_install.sh + - scripts/version.sh when: on_success needs: - job: trigger diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 10c161d31497..e1f57f574a47 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -512,6 +512,8 @@ let changeset_debian_packages = "scripts/ci/create_debian_repo.sh"; "docs/introduction/install-bin-deb.sh"; "docs/introduction/upgrade-bin-deb.sh"; + "scripts/version.sh"; + "manifest/**/*.ml*"; ]) let changeset_rpm_packages = @@ -526,6 +528,8 @@ let changeset_rpm_packages = "scripts/ci/build-rpm-packages.sh"; "scripts/ci/prepare-apt-rpm-repo.sh"; "scripts/ci/create_rpm_repo.sh"; + "scripts/version.sh"; + "manifest/**/*.ml*"; ]) let changeset_homebrew = @@ -537,6 +541,8 @@ let changeset_homebrew = "scripts/ci/install-gsutil.sh"; "scripts/packaging/homebrew_install.sh"; "scripts/packaging/Formula/*"; + "scripts/version.sh"; + "manifest/**/*.ml*"; ]) (** The set of [changes:] that select opam jobs. -- GitLab