From feb8929ecf9c9e9b28252589f0301c685ca0fad8 Mon Sep 17 00:00:00 2001 From: krendelhoff2 Date: Mon, 24 Jun 2024 11:49:58 +0530 Subject: [PATCH 1/3] [Chore] Update release pipeline Problem: Currently, we can launch release pipeline for our local releases, since we provide `--launchpad-sources` flag for the ubuntu build. Solution: Launch pipeline on every packaging tag push. --- .buildkite/pipeline-for-tags.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.buildkite/pipeline-for-tags.yml b/.buildkite/pipeline-for-tags.yml index 31adf7178..01ea8ad4c 100644 --- a/.buildkite/pipeline-for-tags.yml +++ b/.buildkite/pipeline-for-tags.yml @@ -15,16 +15,21 @@ steps: - label: Build ubuntu source packages key: build-ubuntu-source-packages - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ commands: - eval "$SET_VERSION" - - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type source + - | + if [[ "$BUILDKITE_TAG" =~ ^v.*-1 ]]; then + nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type source + else + nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type source --launchpad-sources + fi artifact_paths: - ./out/* - label: Build fedora source packages key: build-fedora-source-packages - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ commands: - eval "$SET_VERSION" - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type source @@ -32,7 +37,7 @@ steps: - ./out/* - label: Sign ubuntu source packages - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ depends_on: - "build-ubuntu-source-packages" key: sign-ubuntu-source-packages @@ -44,7 +49,7 @@ steps: - ./out/* - label: Sign fedora source packages - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ depends_on: - "build-fedora-source-packages" key: sign-fedora-source-packages @@ -56,7 +61,7 @@ steps: - ./out/* - label: Publish ubuntu native packages - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ depends_on: - "sign-ubuntu-source-packages" commands: @@ -65,7 +70,7 @@ steps: - nix develop .#buildkite -c ./docker/build/ubuntu/upload.py -d out - label: Publish fedora native packages - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ depends_on: - "sign-fedora-source-packages" commands: @@ -74,7 +79,7 @@ steps: - nix develop .#buildkite -c ./docker/build/fedora/upload.py -d out - label: build-via-docker - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ key: build-via-docker commands: - eval "$SET_VERSION" @@ -85,7 +90,7 @@ steps: - label: Build source packages from static binaries key: build-source-packages-from-static-binaries - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ depends_on: - "build-via-docker" commands: @@ -98,7 +103,7 @@ steps: - label: Sign source packages built from static binaries key: sign-source-packages-built-from-static-binaries - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ depends_on: - "build-source-packages-from-static-binaries" commands: @@ -109,7 +114,7 @@ steps: - ./epel/* - label: Publish epel packages - if: build.tag =~ /^v.*-1/ + if: build.tag =~ /^v.*/ depends_on: - "sign-source-packages-built-from-static-binaries" commands: From ae448a568cc79736c9c71e94677c6f702dd4192f Mon Sep 17 00:00:00 2001 From: krendelhoff2 Date: Mon, 24 Jun 2024 12:10:37 +0530 Subject: [PATCH 2/3] [Chore] Fix tag handling during formulae update Problem: Tag was handled incorrectly, since upstream tag is prepended with "octez-". Solution: Pass upstream tag and formulae version as parameters to the script. --- scripts/update-brew-formulae.sh | 23 +++++++++-------------- scripts/update-tezos.sh | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/scripts/update-brew-formulae.sh b/scripts/update-brew-formulae.sh index a5ba61e2d..567b0333b 100755 --- a/scripts/update-brew-formulae.sh +++ b/scripts/update-brew-formulae.sh @@ -7,20 +7,15 @@ if [[ -d ./Formula ]] then - regex="(v.*)-[0-9]*" - if [[ $1 =~ $regex ]]; then - tag="${BASH_REMATCH[0]}" - version="${BASH_REMATCH[1]}" - find ./Formula -type f \( -name 'tezos-*.rb' ! -name 'tezos-sapling-params.rb' \) \ - -exec sed -i "s/version \"v.*\"/version \"$tag\"/g" {} \; \ - -exec sed -i "s/:tag => \".*\"/:tag => \"$version\"/g" {} \; \ - -exec sed -i "/catalina/d" {} \; \ - -exec sed -i "/monterey/d" {} \; \ - -exec sed -i "/arm64_monterey/d" {} \; \ - -exec sed -i "/mojave/d" {} \; - else - echo "The argument does not look like a tag, which should have a form of 'v*-[0-9]*'" - fi + tag="$1" + version="$2" + find ./Formula -type f \( -name 'tezos-*.rb' ! -name 'tezos-sapling-params.rb' \) \ + -exec sed -i "s/version \"v.*\"/version \"$version\"/g" {} \; \ + -exec sed -i "s/:tag => \".*\"/:tag => \"$tag\"/g" {} \; \ + -exec sed -i "/catalina/d" {} \; \ + -exec sed -i "/monterey/d" {} \; \ + -exec sed -i "/arm64_monterey/d" {} \; \ + -exec sed -i "/mojave/d" {} \; else echo "Please run this script from the base directory (tezos-packaging)." fi diff --git a/scripts/update-tezos.sh b/scripts/update-tezos.sh index 7b9cb8635..63fab2397 100755 --- a/scripts/update-tezos.sh +++ b/scripts/update-tezos.sh @@ -46,7 +46,7 @@ if [[ "$latest_upstream_tag" != "$our_tezos_tag" ]]; then ./scripts/update-input.py opam-repository "$full_opam_repository_tag" git commit -a -m "[Chore] Bump Tezos sources to $packaging_tag" --gpg-sign="tezos-packaging@serokell.io" - ./scripts/update-brew-formulae.sh "$packaging_tag-1" + ./scripts/update-brew-formulae.sh "$latest_upstream_tag" "$packaging_tag-1" git commit -a -m "[Chore] Update brew formulae for $packaging_tag" --gpg-sign="tezos-packaging@serokell.io" sed -i 's/"release": "[0-9]\+"/"release": "1"/' ./meta.json From 92ade662a3e47a7c67d86f8f924ede677a2879f7 Mon Sep 17 00:00:00 2001 From: krendelhoff2 Date: Mon, 24 Jun 2024 14:05:02 +0530 Subject: [PATCH 3/3] [Chore] Remove unused import Problem: Script for test binaries update imports definition, which results in failure at this point. It is also unused. Solution: Remove it. --- docker/package/update-test-binaries-list.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/package/update-test-binaries-list.py b/docker/package/update-test-binaries-list.py index 526a6c4e2..534df20eb 100755 --- a/docker/package/update-test-binaries-list.py +++ b/docker/package/update-test-binaries-list.py @@ -4,7 +4,6 @@ import os import json -from .packages import packages as all_packages from .meta import packages_meta binaries_json_path_suffix = "tests/binaries.json"