Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ci/check_runtime_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ if [ "${tag_runtime}" != "${runtime}" ]; then
fn_die "ERROR: Runtime in the tag (${tag_runtime}) does not match the expected runtime (${runtime}). Exiting ..."
fi

if [[ "${runtime}" = "zkverify" && -z "${version_ext}" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if [[ "${runtime}" = "zkverify" && -z "${version_ext}" ]]; then
if [[ "${runtime}" = "mainnet" && -z "${version_ext}" ]]; then

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch.... I've just copied and pasted it without brain 😄

log_info "INFO: checking that zkverify and volta production release tags point to the same commit..."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log_info "INFO: checking that zkverify and volta production release tags point to the same commit..."
log_info "INFO: checking that mainnet and volta production release tags point to the same commit..."

volta_tag="rt-volta-${version}"
if [ "$(git_tag_commit "${github_tag}")" != "$(git_tag_commit "${volta_tag}")" ]; then
fn_die "ERROR: commit pointed to by zkverify tag (${github_tag}) does not match commit of volta tag (${volta_tag}). Exiting..."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fn_die "ERROR: commit pointed to by zkverify tag (${github_tag}) does not match commit of volta tag (${volta_tag}). Exiting..."
fn_die "ERROR: commit pointed to by mainnet tag (${github_tag}) does not match commit of volta tag (${volta_tag}). Exiting..."

fi
fi

# Checking if it is a release build
if git branch -r --contains "${github_tag}" | grep -xqE ". origin\/${release_branch}\/rt-${runtime}\/${version_str}$"; then
IS_A_RELEASE="true"
Expand Down
5 changes: 5 additions & 0 deletions ci/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,8 @@ check_signed_tag() {
IS_A_RELEASE="false"
fi
}

function git_tag_commit {
local tag="$1"
git rev-list -n 1 "${tag}"
}