[CI/CD] Enhancement.

1. change rpm/deb version of Development Release
   set 'latest' dev-release version as v$major.$minor.${patch+1}rc

2. set version number into overlaybd-snapshotter & convertor

Signed-off-by: Yifan Yuan <[email protected]>

Author: BigVan

.github/workflows/release.yml

@@ -36,7 +36,19 @@ jobs:
         RELEASE_VERSION=${{ env.RELEASE_VERSION }}
         if [[ -z ${RELEASE_VERSION} ]]; then
           git fetch --tags
-          RELEASE_VERSION=$(git tag --sort=v:refname -l v* | tail -1)
+          RELEASE_VERSION=$(git tag --sort=v:refname -l v* | tail -1) #v1.1.3
+          version="${RELEASE_VERSION#v}"
+
+          IFS='.' read -ra version_parts <<< "$version"
+
+          major_version=${version_parts[0]}
+          minor_version=${version_parts[1]}
+          patch_version=${version_parts[2]}
+
+          ((patch_version++))
+
+          new_version="$major_version.$minor_version.$patch_version"
+          RELEASE_VERSION="${new_version}rc" #1.1.4rc
         fi
         echo "RELEASE_VERSION=${RELEASE_VERSION}"
         RELEASE_NUM="$(date +%Y%m%d%H%M%S).$(git rev-parse --short HEAD)"

.github/workflows/release/Dockerfile

@@ -30,6 +30,7 @@ ARG RELEASE_VERSION
 ENV SEMVER=${RELEASE_VERSION}
 ARG RELEASE_NUM
 ENV RELEASE=${RELEASE_NUM}
+ENV COMMIT_ID="${RELEASE_VERSION}_${RELEASE_NUM}"
 RUN make && \
     nfpm pkg --packager deb --target /tmp/ && \
     nfpm pkg --packager rpm --target /tmp/

Makefile

@@ -19,7 +19,7 @@ force:
 # build a binary from cmd
 bin/%: cmd/% force
 	@echo "$@"
-	@GOOS=linux CGO_ENABLED=0 go build -ldflags "-X 'main.commitID=$$(git rev-parse --short HEAD)'" -o $@ ./$<
+	@GOOS=linux CGO_ENABLED=0 go build -ldflags "-X 'main.commitID=$$COMMIT_ID'" -o $@ ./$<
 
 install: ## install binaries from bin
 	@mkdir -p $(SN_DESTDIR)

ci/build_image/Dockerfile

@@ -29,6 +29,9 @@ ENV GOOS=${TARGETOS}
 ENV GOARCH=${TARGETARCH}
 ARG RELEASE_VERSION
 ENV SEMVER=${RELEASE_VERSION}
+ARG RELEASE_NUM
+ENV RELEASE=${RELEASE_NUM}
+ENV COMMIT_ID="${RELEASE_VERSION}_${RELEASE_NUM}"
 RUN make && \
     nfpm pkg --packager deb --target /tmp/ && \
     nfpm pkg --packager rpm --target /tmp/

cmd/convertor/main.go

@@ -31,6 +31,7 @@ import (
 )
 
 var (
+	commitID         string = "unknown"
 	repo             string
 	user             string
 	plain            bool
@@ -61,7 +62,10 @@ var (
 	rootCmd = &cobra.Command{
 		Use:   "convertor",
 		Short: "An image conversion tool from oci image to overlaybd image.",
-		Long:  "overlaybd convertor is a standalone userspace image conversion tool that helps converting oci images to overlaybd images",
+		Long: `
+Description: overlaybd convertor is a standalone userspace image conversion tool that helps converting oci images to overlaybd images.
+
+Version: ` + commitID,
 		Run: func(cmd *cobra.Command, args []string) {
 			if verbose {
 				logrus.SetLevel(logrus.DebugLevel)