[3.4] Backport cherry-pick of etcd-io#14860: Trigger release in curre…

…nt branch for github workflow case

Signed-off-by: ArkaSaha30 <[email protected]>

.github/workflows/release.yaml

@@ -23,4 +23,4 @@ jobs:
         Name-Email: [email protected]
         Expire-Date: 0
         EOF
-        DRY_RUN=true ./scripts/release.sh --no-upload --no-docker-push 3.4.99
+        DRY_RUN=true ./scripts/release --no-upload --no-docker-push --in-place 3.4.99

scripts/build-binary

@@ -0,0 +1,105 @@
+#!/usr/bin/env bash
+
+set -e
+
+source ./scripts/test_lib.sh
+
+VER=$1
+REPOSITORY="${REPOSITORY:-git@github.com:etcd-io/etcd.git}"
+
+if [ -z "$1" ]; then
+  echo "Usage: ${0} VERSION" >> /dev/stderr
+  exit 255
+fi
+
+set -u
+
+function setup_env {
+  local ver=${1}
+  local proj=${2}
+
+  if [ ! -d "${proj}" ]; then
+    run git clone "${REPOSITORY}"
+  fi
+
+  pushd "${proj}" >/dev/null
+    run git fetch --all
+    run git checkout "${ver}"
+  popd >/dev/null
+}
+
+
+function package {
+  local target=${1}
+  local srcdir="${2}/bin"
+
+  local ccdir="${srcdir}/${GOOS}_${GOARCH}"
+  if [ -d "${ccdir}" ]; then
+    srcdir="${ccdir}"
+  fi
+  local ext=""
+  if [ "${GOOS}" == "windows" ]; then
+    ext=".exe"
+  fi
+  for bin in etcd etcdctl etcdutl; do
+    cp "${srcdir}/${bin}" "${target}/${bin}${ext}"
+  done
+
+  cp etcd/README.md "${target}"/README.md
+  cp etcd/etcdctl/README.md "${target}"/README-etcdctl.md
+  cp etcd/etcdctl/READMEv2.md "${target}"/READMEv2-etcdctl.md
+  cp etcd/etcdutl/README.md "${target}"/README-etcdutl.md
+
+  cp -R etcd/Documentation "${target}"/Documentation
+}
+
+function main {
+  local proj="etcd"
+
+  mkdir -p release
+  cd release
+  setup_env "${VER}" "${proj}"
+
+  tarcmd=tar
+  if [[ $(go env GOOS) == "darwin" ]]; then
+      echo "Please use linux machine for release builds."
+    exit 1
+  fi
+
+  for os in darwin windows linux; do
+    export GOOS=${os}
+    TARGET_ARCHS=("amd64")
+
+    if [ ${GOOS} == "linux" ]; then
+      TARGET_ARCHS+=("arm64")
+      TARGET_ARCHS+=("ppc64le")
+      TARGET_ARCHS+=("s390x")
+    fi
+
+    if [ ${GOOS} == "darwin" ]; then
+      TARGET_ARCHS+=("arm64")
+    fi
+
+    for TARGET_ARCH in "${TARGET_ARCHS[@]}"; do
+      export GOARCH=${TARGET_ARCH}
+
+      pushd etcd >/dev/null
+      GO_LDFLAGS="-s -w" ./build.sh
+      popd >/dev/null
+
+      TARGET="etcd-${VER}-${GOOS}-${GOARCH}"
+      mkdir "${TARGET}"
+      package "${TARGET}" "${proj}"
+
+      if [ ${GOOS} == "linux" ]; then
+        ${tarcmd} cfz "${TARGET}.tar.gz" "${TARGET}"
+        echo "Wrote release/${TARGET}.tar.gz"
+      else
+        zip -qr "${TARGET}.zip" "${TARGET}"
+        echo "Wrote release/${TARGET}.zip"
+      fi
+    done
+  done
+}
+
+main

scripts/release.sh

@@ -23,6 +23,7 @@ help() {
   echo "  flags:"
   echo "    --no-upload: skip gs://etcd binary artifact uploads."
   echo "    --no-docker-push: skip docker image pushes."
+  echo "    --in-place: build binaries using current branch."
   echo ""
 }
 
@@ -34,7 +35,15 @@ main() {
   fi
   RELEASE_VERSION="v${VERSION}"
   MINOR_VERSION=$(echo "${VERSION}" | cut -d. -f 1-2)
-  BRANCH="release-${MINOR_VERSION}"
+
+  if [ "${IN_PLACE}" == 1 ]; then
+      # Trigger release in current branch
+      REPOSITORY=$(pwd)
+      BRANCH=$(git rev-parse --abbrev-ref HEAD)
+  else
+      REPOSITORY=${REPOSITORY:-"https://github.com/etcd-io/etcd.git"}
+      BRANCH=${BRANCH:-"release-${MINOR_VERSION}"}
+  fi
 
   log_warning "DRY_RUN=${DRY_RUN}"
   log_callout "RELEASE_VERSION=${RELEASE_VERSION}"
@@ -53,12 +62,19 @@ main() {
   # Set up release directory.
   local reldir="/tmp/etcd-release-${VERSION}"
   log_callout "Preparing temporary directory: ${reldir}"
-  if [ ! -d "${reldir}/etcd" ]; then
+  if [ ! -d "${reldir}/etcd" ] && [ "${IN_PLACE}" == 0 ]; then
     mkdir -p "${reldir}"
     cd "${reldir}"
-    git clone https://github.com/etcd-io/etcd.git --branch "${BRANCH}"
+    run git clone "${REPOSITORY}" --branch "${BRANCH}"
+    run cd "${reldir}/etcd" || exit 2
+    run git checkout "${BRANCH}" || exit 2
+    run git pull origin
+
+    git_assert_branch_in_sync || exit 2
   fi
-  cd "${reldir}/etcd"
+
+  # mark local directory as root for test_lib scripts executions
+  set_root_dir
 
   # If a release version tag already exists, use it.
   log_callout "Checking tag: ${RELEASE_VERSION}"
@@ -70,7 +86,7 @@ main() {
   fi
 
   # Check go version.
-  log_callout "Checking go version"
+  log_callout "Check go version"
   local go_version current_go_version
   go_version="go$(grep go-version .github/workflows/tests.yaml | awk '{print $2}' | tr -d '"')"
   current_go_version=$(go version | awk '{ print $3 }')
@@ -80,6 +96,7 @@ main() {
   fi
 
   # If the release tag does not already exist remotely, create it.
+  log_callout "Create tag if not present"
   if [ "${remote_tag_exists}" -eq 0 ]; then
     # Bump version/version.go to release version.
     local source_version
@@ -112,8 +129,8 @@ main() {
     fi
 
     # Push the version change if it's not already been pushed.
-    if [ "$DRY_RUN" != "true" ] && [ "$(git rev-list --count "origin/${BRANCH}..${BRANCH}")" -gt 0 ]; then
-      read -p "Push version bump up to ${VERSION} to github.com/etcd-io/etcd [y/N]? " -r confirm
+    if [ "${DRY_RUN}" != "true" ] && [ "$(git rev-list --count "origin/${BRANCH}..${BRANCH}")" -gt 0 ]; then
+      read -p "Push version bump up to ${VERSION} to '$(git remote get-url origin)' [y/N]? " -r confirm
       [[ "${confirm,,}" == "y" ]] || exit 1
       git push
     fi
@@ -140,20 +157,37 @@ main() {
       exit 1
     fi
 
-    # Verify the version tag is on the right branch
-    # shellcheck disable=SC2155
-    local branch=$(git for-each-ref --contains "${RELEASE_VERSION}" --format="%(refname)" 'refs/heads' | cut -d '/' -f 3)
-    if [ "${branch}" != "release-${MINOR_VERSION}" ]; then
-      log_error "Error: Git tag ${RELEASE_VERSION} should be on branch release-${MINOR_VERSION} but is on ${branch}"
-      exit 1
+    if [ "${IN_PLACE}" == 0 ]; then
+      # Tried with `local branch=$(git branch -a --contains tags/"${RELEASE_VERSION}")`
+      # so as to work with both current branch and main/release-3.X.
+      # But got error below on current branch mode,
+      # Error: Git tag v3.6.99 should be on branch '* (HEAD detached at pull/14860/merge)' but is on '* (HEAD detached from pull/14860/merge)'
+      #
+      # Verify the version tag is on the right branch
+      # shellcheck disable=SC2155
+      local branch=$(git for-each-ref --contains "${RELEASE_VERSION}" --format="%(refname)" 'refs/heads' | cut -d '/' -f 3)
+      if [ "${branch}" != "${BRANCH}" ]; then
+        log_error "Error: Git tag ${RELEASE_VERSION} should be on branch '${BRANCH}' but is on '${branch}'"
+        exit 1
+      fi
     fi
 
-    # Push the tag change if it's not already been pushed.
-    if [ "$DRY_RUN" != "true" ]; then
-      read -p "Push etcd ${RELEASE_VERSION} tag [y/N]? " -r confirm
-      [[ "${confirm,,}" == "y" ]] || exit 1
-      git push origin "tags/${RELEASE_VERSION}"
-    fi
+  log_callout "Verify the latest commit has the version tag"
+  # Verify the latest commit has the version tag
+  # shellcheck disable=SC2155
+  local tag="$(git describe --exact-match HEAD)"
+  if [ "${tag}" != "${RELEASE_VERSION}" ]; then
+    log_error "Error: Expected HEAD to be tagged with ${RELEASE_VERSION}, but 'git describe --exact-match HEAD' reported: ${tag}"
+    exit 1
+  fi
+
+  log_callout "Verify the work space is clean"
+  # Verify the clean working tree
+  # shellcheck disable=SC2155
+  local diff="$(git diff HEAD --stat)"
+  if [[ "${diff}" != '' ]]; then
+    log_error "Error: Expected clean working tree, but 'git diff --stat' reported: ${diff}"
+    exit 1
   fi
 
   # Build release.
@@ -185,8 +219,8 @@ main() {
   fi
 
   # Upload artifacts.
-  if [ "$DRY_RUN" = "true" ] || [ "${NO_UPLOAD}" == 1 ]; then
-    log_callout "Skipping artifact upload to gs://etcd. --no-upload flat is set or DRY_RUN is true."
+  if [ "${DRY_RUN}" == "true" ] || [ "${NO_UPLOAD}" == 1 ]; then
+    log_callout "Skipping artifact upload to gs://etcd. --no-upload flat is set."
   else
     read -p "Upload etcd ${RELEASE_VERSION} release artifacts to gs://etcd [y/N]? " -r confirm
     [[ "${confirm,,}" == "y" ]] || exit 1
@@ -197,8 +231,8 @@ main() {
   fi
 
   # Push images.
-  if [ "$DRY_RUN" = "true" ] || [ "${NO_DOCKER_PUSH}" == 1 ]; then
-    log_callout "Skipping docker push. --no-docker-push flat is set or DRY_RUN is true."
+  if [ "${DRY_RUN}" == "true" ] || [ "${NO_DOCKER_PUSH}" == 1 ]; then
+    log_callout "Skipping docker push. --no-docker-push flat is set."
   else
     read -p "Publish etcd ${RELEASE_VERSION} docker images to quay.io [y/N]? " -r confirm
     [[ "${confirm,,}" == "y" ]] || exit 1
@@ -261,6 +295,7 @@ main() {
 POSITIONAL=()
 NO_UPLOAD=0
 NO_DOCKER_PUSH=0
+IN_PLACE=0
 
 while test $# -gt 0; do
         case "$1" in
@@ -269,6 +304,10 @@ while test $# -gt 0; do
             help
             exit 0
             ;;
+          --in-place)
+            IN_PLACE=1
+            shift
+            ;;
           --no-upload)
             NO_UPLOAD=1
             shift
@@ -290,4 +329,11 @@ if [[ ! $# -eq 1 ]]; then
   exit 1
 fi
 
+# Note that we shouldn't upload artifacts in --in-place mode, so it
+# must be called with DRY_RUN=true
+if [ "${DRY_RUN}" != "true" ] && [ "${IN_PLACE}" == 1 ]; then
+   log_error "--in-place should only be called with DRY_RUN=true"
+   exit 1
+fi
+
 main "$1"