From bc113cad4eaf670b4cf82c52b92516e06cf8289b Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 15 Jan 2024 17:38:22 +0100 Subject: [PATCH 1/6] CI, Releases: Rename octez releases pipelines --- .gitlab-ci.yml | 20 +++++++++---------- ...ase_tag.yml => octez_beta_release_tag.yml} | 0 ...t_release.yml => octez_latest_release.yml} | 0 ...test.yml => octez_latest_release_test.yml} | 0 ...{release_tag.yml => octez_release_tag.yml} | 0 ...ag_test.yml => octez_release_tag_test.yml} | 0 ci/bin/main.ml | 10 +++++----- 7 files changed, 15 insertions(+), 15 deletions(-) rename .gitlab/ci/pipelines/{beta_release_tag.yml => octez_beta_release_tag.yml} (100%) rename .gitlab/ci/pipelines/{latest_release.yml => octez_latest_release.yml} (100%) rename .gitlab/ci/pipelines/{latest_release_test.yml => octez_latest_release_test.yml} (100%) rename .gitlab/ci/pipelines/{release_tag.yml => octez_release_tag.yml} (100%) rename .gitlab/ci/pipelines/{release_tag_test.yml => octez_release_tag_test.yml} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d18be8543388..ae9aa13aa6cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,12 +11,12 @@ workflow: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "latest-release" variables: - PIPELINE_TYPE: latest_release + PIPELINE_TYPE: octez_latest_release when: always - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "latest-release-test" variables: - PIPELINE_TYPE: latest_release_test + PIPELINE_TYPE: octez_latest_release_test when: always - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master" @@ -26,17 +26,17 @@ workflow: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^v\d+\.\d+(?:\-rc\d+)?$/ variables: - PIPELINE_TYPE: release_tag + PIPELINE_TYPE: octez_release_tag when: always - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^v\d+\.\d+\-beta\d*$/ variables: - PIPELINE_TYPE: beta_release_tag + PIPELINE_TYPE: octez_beta_release_tag when: always - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_TAG =~ /^v\d+\.\d+(?:\-rc\d+)?$/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+\-beta\d*$/) variables: - PIPELINE_TYPE: release_tag_test + PIPELINE_TYPE: octez_release_tag_test when: always - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG != null && $CI_COMMIT_TAG !~ /^v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG !~ @@ -100,12 +100,12 @@ include: rules: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "merge_request_event" when: always -- local: .gitlab/ci/pipelines/latest_release.yml +- local: .gitlab/ci/pipelines/octez_latest_release.yml rules: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "latest-release" when: always -- local: .gitlab/ci/pipelines/latest_release_test.yml +- local: .gitlab/ci/pipelines/octez_latest_release_test.yml rules: - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "latest-release-test" @@ -115,17 +115,17 @@ include: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master" when: always -- local: .gitlab/ci/pipelines/release_tag.yml +- local: .gitlab/ci/pipelines/octez_release_tag.yml rules: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^v\d+\.\d+(?:\-rc\d+)?$/ when: always -- local: .gitlab/ci/pipelines/beta_release_tag.yml +- local: .gitlab/ci/pipelines/octez_beta_release_tag.yml rules: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^v\d+\.\d+\-beta\d*$/ when: always -- local: .gitlab/ci/pipelines/release_tag_test.yml +- local: .gitlab/ci/pipelines/octez_release_tag_test.yml rules: - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_TAG =~ /^v\d+\.\d+(?:\-rc\d+)?$/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+\-beta\d*$/) diff --git a/.gitlab/ci/pipelines/beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml similarity index 100% rename from .gitlab/ci/pipelines/beta_release_tag.yml rename to .gitlab/ci/pipelines/octez_beta_release_tag.yml diff --git a/.gitlab/ci/pipelines/latest_release.yml b/.gitlab/ci/pipelines/octez_latest_release.yml similarity index 100% rename from .gitlab/ci/pipelines/latest_release.yml rename to .gitlab/ci/pipelines/octez_latest_release.yml diff --git a/.gitlab/ci/pipelines/latest_release_test.yml b/.gitlab/ci/pipelines/octez_latest_release_test.yml similarity index 100% rename from .gitlab/ci/pipelines/latest_release_test.yml rename to .gitlab/ci/pipelines/octez_latest_release_test.yml diff --git a/.gitlab/ci/pipelines/release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml similarity index 100% rename from .gitlab/ci/pipelines/release_tag.yml rename to .gitlab/ci/pipelines/octez_release_tag.yml diff --git a/.gitlab/ci/pipelines/release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml similarity index 100% rename from .gitlab/ci/pipelines/release_tag_test.yml rename to .gitlab/ci/pipelines/octez_release_tag_test.yml diff --git a/ci/bin/main.ml b/ci/bin/main.ml index 6df8abbd3f9c..e99fd5f55f3c 100644 --- a/ci/bin/main.ml +++ b/ci/bin/main.ml @@ -974,11 +974,11 @@ let () = in register "before_merging" If.(on_tezos_namespace && merge_request) ; register - "latest_release" + "octez_latest_release" ~jobs:[job_docker_promote_to_latest ~ci_docker_hub:true] If.(on_tezos_namespace && push && on_branch "latest-release") ; register - "latest_release_test" + "octez_latest_release_test" If.(not_on_tezos_namespace && push && on_branch "latest-release-test") ~jobs:[job_docker_promote_to_latest ~ci_docker_hub:false] ; register @@ -1137,15 +1137,15 @@ let () = job_publish_kernel_sdk; ]) ; register - "release_tag" + "octez_release_tag" If.(on_tezos_namespace && push && has_tag_match release_tag_re) ~jobs:(release_tag_pipeline Release_tag) ; register - "beta_release_tag" + "octez_beta_release_tag" If.(on_tezos_namespace && push && has_tag_match beta_release_tag_re) ~jobs:(release_tag_pipeline Beta_release_tag) ; register - "release_tag_test" + "octez_release_tag_test" If.(not_on_tezos_namespace && push && has_any_release_tag) ~jobs:(release_tag_pipeline ~test:true Release_tag) ; register -- GitLab From 92741edbba6f1a9ab476a3d152b20ec8d3d2664d Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 14 Feb 2024 18:39:15 +0100 Subject: [PATCH 2/6] CI, Releases: Add prefix octez- to octez release tags --- .gitlab-ci.yml | 28 ++++++++++++++-------------- ci/bin/main.ml | 22 ++++++++++++---------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae9aa13aa6cc..3f99449bc614 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,29 +24,29 @@ workflow: PIPELINE_TYPE: master_branch when: always - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - =~ /^v\d+\.\d+(?:\-rc\d+)?$/ + =~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ variables: PIPELINE_TYPE: octez_release_tag when: always - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - =~ /^v\d+\.\d+\-beta\d*$/ + =~ /^octez-v\d+\.\d+\-beta\d*$/ variables: PIPELINE_TYPE: octez_beta_release_tag when: always - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_TAG - =~ /^v\d+\.\d+(?:\-rc\d+)?$/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+\-beta\d*$/) + =~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ || $CI_COMMIT_TAG =~ /^octez-v\d+\.\d+\-beta\d*$/) variables: PIPELINE_TYPE: octez_release_tag_test when: always - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - != null && $CI_COMMIT_TAG !~ /^v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG !~ - /^v\d+\.\d+\-beta\d*$/ + != null && $CI_COMMIT_TAG !~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG + !~ /^octez-v\d+\.\d+\-beta\d*$/ variables: PIPELINE_TYPE: non_release_tag when: always - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - != null && $CI_COMMIT_TAG !~ /^v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG !~ - /^v\d+\.\d+\-beta\d*$/ + != null && $CI_COMMIT_TAG !~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG + !~ /^octez-v\d+\.\d+\-beta\d*$/ variables: PIPELINE_TYPE: non_release_tag_test when: always @@ -118,29 +118,29 @@ include: - local: .gitlab/ci/pipelines/octez_release_tag.yml rules: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - =~ /^v\d+\.\d+(?:\-rc\d+)?$/ + =~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ when: always - local: .gitlab/ci/pipelines/octez_beta_release_tag.yml rules: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - =~ /^v\d+\.\d+\-beta\d*$/ + =~ /^octez-v\d+\.\d+\-beta\d*$/ when: always - local: .gitlab/ci/pipelines/octez_release_tag_test.yml rules: - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_TAG - =~ /^v\d+\.\d+(?:\-rc\d+)?$/ || $CI_COMMIT_TAG =~ /^v\d+\.\d+\-beta\d*$/) + =~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ || $CI_COMMIT_TAG =~ /^octez-v\d+\.\d+\-beta\d*$/) when: always - local: .gitlab/ci/pipelines/non_release_tag.yml rules: - if: $CI_PROJECT_NAMESPACE == "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - != null && $CI_COMMIT_TAG !~ /^v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG !~ - /^v\d+\.\d+\-beta\d*$/ + != null && $CI_COMMIT_TAG !~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG + !~ /^octez-v\d+\.\d+\-beta\d*$/ when: always - local: .gitlab/ci/pipelines/non_release_tag_test.yml rules: - if: $CI_PROJECT_NAMESPACE != "tezos" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG - != null && $CI_COMMIT_TAG !~ /^v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG !~ - /^v\d+\.\d+\-beta\d*$/ + != null && $CI_COMMIT_TAG !~ /^octez-v\d+\.\d+(?:\-rc\d+)?$/ && $CI_COMMIT_TAG + !~ /^octez-v\d+\.\d+\-beta\d*$/ when: always - local: .gitlab/ci/pipelines/schedule_extended_test.yml rules: diff --git a/ci/bin/main.ml b/ci/bin/main.ml index e99fd5f55f3c..9275b6c50ee3 100644 --- a/ci/bin/main.ml +++ b/ci/bin/main.ml @@ -959,18 +959,20 @@ let enable_coverage_report job : tezos_job = manually in .yml, but will eventually be generated. *) let () = (* Matches release tags, e.g. [v1.2.3] or [v1.2.3-rc4]. *) - let release_tag_re = "/^v\\d+\\.\\d+(?:\\-rc\\d+)?$/" in + let octez_release_tag_re = "/^octez-v\\d+\\.\\d+(?:\\-rc\\d+)?$/" in (* Matches beta release tags, e.g. [v1.2.3-beta5]. *) - let beta_release_tag_re = "/^v\\d+\\.\\d+\\-beta\\d*$/" in + let octez_beta_release_tag_re = "/^octez-v\\d+\\.\\d+\\-beta\\d*$/" in let open Rules in let open Pipeline in - (* Matches either release tags or beta release tags, e.g. [v1.2.3], - [v1.2.3-rc4] or [v1.2.3-beta5]. *) - let has_any_release_tag = - If.(has_tag_match release_tag_re || has_tag_match beta_release_tag_re) + (* Matches either Octez release tags or Octez beta release tags, + e.g. [octez-v1.2.3], [octez-v1.2.3-rc4] or [octez-v1.2.3-beta5]. *) + let has_any_octez_release_tag = + If.( + has_tag_match octez_release_tag_re + || has_tag_match octez_beta_release_tag_re) in let has_non_release_tag = - If.(Predefined_vars.ci_commit_tag != null && not has_any_release_tag) + If.(Predefined_vars.ci_commit_tag != null && not has_any_octez_release_tag) in register "before_merging" If.(on_tezos_namespace && merge_request) ; register @@ -1138,15 +1140,15 @@ let () = ]) ; register "octez_release_tag" - If.(on_tezos_namespace && push && has_tag_match release_tag_re) + If.(on_tezos_namespace && push && has_tag_match octez_release_tag_re) ~jobs:(release_tag_pipeline Release_tag) ; register "octez_beta_release_tag" - If.(on_tezos_namespace && push && has_tag_match beta_release_tag_re) + If.(on_tezos_namespace && push && has_tag_match octez_beta_release_tag_re) ~jobs:(release_tag_pipeline Beta_release_tag) ; register "octez_release_tag_test" - If.(not_on_tezos_namespace && push && has_any_release_tag) + If.(not_on_tezos_namespace && push && has_any_octez_release_tag) ~jobs:(release_tag_pipeline ~test:true Release_tag) ; register "non_release_tag" -- GitLab From 0998adc2ed238e37b81f9d8ec943e3920807d0c1 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 14 Feb 2024 18:43:51 +0100 Subject: [PATCH 3/6] CI, Releases: Rename release.sh to octez-release.sh --- scripts/ci/create_gitlab_package.sh | 4 ++-- scripts/ci/create_gitlab_release.sh | 4 ++-- scripts/ci/{release.sh => octez-release.sh} | 0 scripts/ci/opam-release.sh | 4 ++-- scripts/ci/restrict_export_to_octez_source.sh | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename scripts/ci/{release.sh => octez-release.sh} (100%) diff --git a/scripts/ci/create_gitlab_package.sh b/scripts/ci/create_gitlab_package.sh index 1a2656e700ac..53308305430c 100755 --- a/scripts/ci/create_gitlab_package.sh +++ b/scripts/ci/create_gitlab_package.sh @@ -8,8 +8,8 @@ set -eu # you should manually delete any previously created package, otherwise it will # reupload the files inside the same package, creating duplicates -# shellcheck source=./scripts/ci/release.sh -. ./scripts/ci/release.sh +# shellcheck source=./scripts/ci/octez-release.sh +. ./scripts/ci/octez-release.sh # https://docs.gitlab.com/ee/user/packages/generic_packages/index.html#download-package-file # :gitlab_api_url/projects/:id/packages/generic/:package_name/:package_version/:file_name diff --git a/scripts/ci/create_gitlab_release.sh b/scripts/ci/create_gitlab_release.sh index 541cceef74ce..98f623937793 100755 --- a/scripts/ci/create_gitlab_release.sh +++ b/scripts/ci/create_gitlab_release.sh @@ -7,8 +7,8 @@ set -eu # In the GitLab namespace 'nomadic-labs', if you want to iterate using the same tag # you should manually delete any previously created release, otherwise it will error -# shellcheck source=./scripts/ci/release.sh -. ./scripts/ci/release.sh +# shellcheck source=./scripts/ci/octez-release.sh +. ./scripts/ci/octez-release.sh echo "Query GitLab to get generic package URL" diff --git a/scripts/ci/release.sh b/scripts/ci/octez-release.sh similarity index 100% rename from scripts/ci/release.sh rename to scripts/ci/octez-release.sh diff --git a/scripts/ci/opam-release.sh b/scripts/ci/opam-release.sh index 7e1fd826e799..cbc303a61c85 100755 --- a/scripts/ci/opam-release.sh +++ b/scripts/ci/opam-release.sh @@ -12,8 +12,8 @@ log() { printf '\e[1m%s\e[0m' "$1" } -# shellcheck source=./scripts/ci/release.sh -. "$ci_dir/release.sh" +# shellcheck source=./scripts/ci/octez-release.sh +. "$ci_dir/octez-release.sh" # set up ssh credentials to access github mkdir -p "$HOME/.ssh" diff --git a/scripts/ci/restrict_export_to_octez_source.sh b/scripts/ci/restrict_export_to_octez_source.sh index 7ec8ba399c16..8deaa44bb2f3 100755 --- a/scripts/ci/restrict_export_to_octez_source.sh +++ b/scripts/ci/restrict_export_to_octez_source.sh @@ -1,8 +1,8 @@ #!/bin/bash set -eu -# shellcheck source=./scripts/ci/release.sh -. ./scripts/ci/release.sh +# shellcheck source=./scripts/ci/octez-release.sh +. ./scripts/ci/octez-release.sh # Adds export-ignore for each part of the repo that is not part of octez ignore="$(comm -2 -3 <(find . -maxdepth 1 | sed 's|^./||' | sort) <(sort "${octez_source_content}"))" -- GitLab From f7f2adfcde0221e6f0c3f7a87bcf61af69bb2424 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 14 Feb 2024 18:59:39 +0100 Subject: [PATCH 4/6] CI, Releases: Rename Releases to "Octez Releases" --- scripts/ci/octez-release.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/ci/octez-release.sh b/scripts/ci/octez-release.sh index 14ef029285bb..65078061a439 100755 --- a/scripts/ci/octez-release.sh +++ b/scripts/ci/octez-release.sh @@ -16,11 +16,13 @@ rpm_packages="$(find . -maxdepth 1 -name octez-\*.rpm)" octez_source_content="$script_inputs_dir/octez-source-content" -### Compute GitLab release names +### Compute GitLab release names from git tags -# Remove the 'v' in front -# X.Y or X.Y-rcZ -gitlab_release_no_v=$(echo "${CI_COMMIT_TAG}" | sed -e 's/^v//g') +# Git tags for octez releases are on the form `octez-vX.Y`, `octez-vX.Y-rcZ` or `octez-vX.Y-betaZ`. + +# Strips the leading 'octez-v' +# X.Y, X.Y-rcZ or X.Y-betaZ +gitlab_release_no_v=$(echo "${CI_COMMIT_TAG}" | sed -e 's/^octez-v//g') # Replace '.' with '-' # X-Y or X-Y-rcZ @@ -28,22 +30,22 @@ gitlab_release_no_v=$(echo "${CI_COMMIT_TAG}" | sed -e 's/^v//g') gitlab_release_no_dot=$(echo "${gitlab_release_no_v}" | sed -e 's/\./-/g') # X -gitlab_release_major_version=$(echo "${CI_COMMIT_TAG}" | sed -nE 's/^v([0-9]+)\.([0-9]+)(-rc[0-9]+)?$/\1/p') +gitlab_release_major_version=$(echo "${CI_COMMIT_TAG}" | sed -nE 's/^octez-v([0-9]+)\.([0-9]+)(-rc[0-9]+)?$/\1/p') # Y -gitlab_release_minor_version=$(echo "${CI_COMMIT_TAG}" | sed -nE 's/^v([0-9]+)\.([0-9]+)(-rc[0-9]+)?$/\2/p') +gitlab_release_minor_version=$(echo "${CI_COMMIT_TAG}" | sed -nE 's/^octez-v([0-9]+)\.([0-9]+)(-rc[0-9]+)?$/\2/p') # Z -gitlab_release_rc_version=$(echo "${CI_COMMIT_TAG}" | sed -nE 's/^v([0-9]+)\.([0-9]+)(-rc)?([0-9]+)?$/\4/p') +gitlab_release_rc_version=$(echo "${CI_COMMIT_TAG}" | sed -nE 's/^octez-v([0-9]+)\.([0-9]+)(-rc)?([0-9]+)?$/\4/p') # Is this a release candidate? if [ -n "${gitlab_release_rc_version}" ]; then # Yes, release name: X.Y~rcZ # shellcheck disable=SC2034 - gitlab_release_name="${gitlab_release_major_version}.${gitlab_release_minor_version}~rc${gitlab_release_rc_version}" + gitlab_release_name="Octez Release Candidate ${gitlab_release_major_version}.${gitlab_release_minor_version}~rc${gitlab_release_rc_version}" opam_release_tag="${gitlab_release_major_version}.${gitlab_release_minor_version}~rc${gitlab_release_rc_version}" else - # No, release name: Release X.Y + # No, release name: Octez Release X.Y # shellcheck disable=SC2034 - gitlab_release_name="Release ${gitlab_release_major_version}.${gitlab_release_minor_version}" + gitlab_release_name="Octez Release ${gitlab_release_major_version}.${gitlab_release_minor_version}" opam_release_tag="${gitlab_release_major_version}.${gitlab_release_minor_version}" fi -- GitLab From e799c96d748e51b816e64346af66f4f33b53d096 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 28 Feb 2024 18:56:59 +0100 Subject: [PATCH 5/6] Version: Parse octez-v-x.y instead of vx.y --- src/lib_version/parser/tezos_version_parser.mll | 2 +- src/lib_version/test/test_parser.ml | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib_version/parser/tezos_version_parser.mll b/src/lib_version/parser/tezos_version_parser.mll index aeaa52f18653..e7f3a5d4a3a0 100644 --- a/src/lib_version/parser/tezos_version_parser.mll +++ b/src/lib_version/parser/tezos_version_parser.mll @@ -40,7 +40,7 @@ let num = ['0'-'9']+ rule version_tag = parse - | 'v'? (num as major) '.' (num as minor) ".0"? + | "octez-" 'v'? (num as major) '.' (num as minor) ".0"? { Some { major = int major; minor = int minor; diff --git a/src/lib_version/test/test_parser.ml b/src/lib_version/test/test_parser.ml index 6304c5664993..38191a3e6d6f 100644 --- a/src/lib_version/test/test_parser.ml +++ b/src/lib_version/test/test_parser.ml @@ -43,14 +43,15 @@ end let legal_versions = [ - ("10.93", {Version.major = 10; minor = 93; additional_info = Release}); - ("v10.93", {Version.major = 10; minor = 93; additional_info = Release}); - ("10.93+dev", {Version.major = 10; minor = 93; additional_info = Dev}); - ("10.93-rc1", {Version.major = 10; minor = 93; additional_info = RC 1}); - ( "10.93-rc1+dev", + ("octez-10.93", {Version.major = 10; minor = 93; additional_info = Release}); + ("octez-v10.93", {Version.major = 10; minor = 93; additional_info = Release}); + ("octez-10.93+dev", {Version.major = 10; minor = 93; additional_info = Dev}); + ("octez-10.93-rc1", {Version.major = 10; minor = 93; additional_info = RC 1}); + ( "octez-10.93-rc1+dev", {Version.major = 10; minor = 93; additional_info = RC_dev 1} ); - ("10.93-beta1", {Version.major = 10; minor = 93; additional_info = Beta 1}); - ( "10.93-beta1+dev", + ( "octez-10.93-beta1", + {Version.major = 10; minor = 93; additional_info = Beta 1} ); + ( "octez-10.93-beta1+dev", {Version.major = 10; minor = 93; additional_info = Beta_dev 1} ); ] -- GitLab From 732f21628b32aad4952897ea57b695dc8688a948 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 29 Feb 2024 13:43:47 +0100 Subject: [PATCH 6/6] CI, Scripts: Fix and rename test_release_versions.sh --- ...oc.script:test_octez_release_versions.yml} | 2 +- .gitlab/ci/pipelines/before_merging.yml | 2 +- .../ci/pipelines/schedule_extended_test.yml | 2 +- ...rsion.sh => test_octez_release_version.sh} | 22 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) rename .gitlab/ci/jobs/test/{oc.script:test_release_versions.yml => oc.script:test_octez_release_versions.yml} (79%) rename scripts/{test_release_version.sh => test_octez_release_version.sh} (70%) diff --git a/.gitlab/ci/jobs/test/oc.script:test_release_versions.yml b/.gitlab/ci/jobs/test/oc.script:test_octez_release_versions.yml similarity index 79% rename from .gitlab/ci/jobs/test/oc.script:test_release_versions.yml rename to .gitlab/ci/jobs/test/oc.script:test_octez_release_versions.yml index db82de9047f9..2314239e5c7a 100644 --- a/.gitlab/ci/jobs/test/oc.script:test_release_versions.yml +++ b/.gitlab/ci/jobs/test/oc.script:test_octez_release_versions.yml @@ -5,4 +5,4 @@ oc.script:test_release_versions: - . ./scripts/version.sh - eval $(opam env) script: - - ./scripts/test_release_version.sh + - ./scripts/test_octez_release_version.sh diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 68dd80247cdb..9f618faa7825 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -41,7 +41,7 @@ include: - .gitlab/ci/jobs/test/oc.integration:compiler-rejections.yml - .gitlab/ci/jobs/test/oc.script:snapshot_alpha_and_link.yml - .gitlab/ci/jobs/test/oc.script:test-gen-genesis.yml - - .gitlab/ci/jobs/test/oc.script:test_release_versions.yml + - .gitlab/ci/jobs/test/oc.script:test_octez_release_versions.yml - .gitlab/ci/jobs/test/oc.script:b58_prefix.yml - .gitlab/ci/jobs/test/oc.test-liquidity-baking-scripts.yml - .gitlab/ci/jobs/test/install_octez.yml diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 2085c08b39c1..068ad27bc242 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -47,7 +47,7 @@ include: - .gitlab/ci/jobs/test/oc.integration:compiler-rejections.yml - .gitlab/ci/jobs/test/oc.script:snapshot_alpha_and_link.yml - .gitlab/ci/jobs/test/oc.script:test-gen-genesis.yml - - .gitlab/ci/jobs/test/oc.script:test_release_versions.yml + - .gitlab/ci/jobs/test/oc.script:test_octez_release_versions.yml - .gitlab/ci/jobs/test/oc.script:b58_prefix.yml - .gitlab/ci/jobs/test/oc.test-liquidity-baking-scripts.yml - .gitlab/ci/jobs/test/tezt.yml diff --git a/scripts/test_release_version.sh b/scripts/test_octez_release_version.sh similarity index 70% rename from scripts/test_release_version.sh rename to scripts/test_octez_release_version.sh index b27713375efb..cca0cd51e030 100755 --- a/scripts/test_release_version.sh +++ b/scripts/test_octez_release_version.sh @@ -25,10 +25,10 @@ test_version() { cleanup() { set +e git tag -d "$RANDOMTAG" > /dev/null 2>&1 - git tag -d "$VERSION" > /dev/null 2>&1 - git tag -d "v$VERSION" > /dev/null 2>&1 - git tag -d "v$VERSION"+rc1 > /dev/null 2>&1 - git tag -d "v$VERSION"-rc1 > /dev/null 2>&1 + git tag -d "octez-$VERSION" > /dev/null 2>&1 + git tag -d "octez-v$VERSION" > /dev/null 2>&1 + git tag -d "octez-v$VERSION"+rc1 > /dev/null 2>&1 + git tag -d "octez-v$VERSION"-rc1 > /dev/null 2>&1 git checkout "$CURRENT_BRANCH" git branch -D "$TESTBRANCH" set -e @@ -40,11 +40,11 @@ cleanup git checkout -b "$TESTBRANCH" -git tag "$VERSION" -m "test" +git tag "octez-$VERSION" -m "test" test_version "$VERSION" "$VERSION" -git tag "v$VERSION" -m "test" -test_version "$VERSION" "v$VERSION" +git tag "octez-v$VERSION" -m "test" +test_version "$VERSION" "octez-v$VERSION" git commit --allow-empty -m "test" > /dev/null 2>&1 test_version "$VERSION+dev" "$(git describe --tags)" @@ -52,11 +52,11 @@ test_version "$VERSION+dev" "$(git describe --tags)" git tag "$RANDOMTAG" -m "test" test_version "0.0+dev" "$RANDOMTAG" -git tag "v$VERSION+rc1" -m "test" -test_version "$VERSION+dev" "v$VERSION+rc1" +git tag "octez-v$VERSION+rc1" -m "test" +test_version "$VERSION+dev" "octez-v$VERSION+rc1" -git tag "v$VERSION-rc1" -m "test" -test_version "$VERSION~rc1" "v$VERSION-rc1" +git tag "octez-v$VERSION-rc1" -m "test" +test_version "$VERSION~rc1" "octez-v$VERSION-rc1" git commit --allow-empty -m "test" > /dev/null 2>&1 test_version "$VERSION~rc1+dev" "$(git describe --tags)" -- GitLab