ci: delete v prefix in git tag (#2752)

Signed-off-by: Rory Z <[email protected]>
lf-edge · Apr 22, 2024 · 7fd9a87 · 7fd9a87
1 parent 1cd7009
commit 7fd9a87
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
@@ -122,7 +122,7 @@ jobs:
           go install fyne.io/fyne/v2/cmd/fyne@latest
       - name: build
         run: |
-          ver=$(git describe --tags --always)
+          ver=$(git describe --tags --always | sed 's/^v//g')
           cd app
           cp -r etc app
           fyne package -os android/arm64 -name kuiper-$ver -metadata version=$ver -release -appID github.com.lfedge.ekuiper -icon icon.png || true        

diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
@@ -84,7 +84,7 @@ jobs:
         make build_with_edgex_and_script
         go build -trimpath --buildmode=plugin -o plugins/sources/Zmq.so extensions/sources/zmq/zmq.go
         go build -trimpath --buildmode=plugin -o plugins/functions/Image.so extensions/functions/image/*.go
-        echo "KUIPER_LOG_PATH=_build/kuiper-$(git describe --tags --always)-$(uname -s | tr "[A-Z]" "[a-z]")-amd64/log" >> $GITHUB_ENV
+        echo "KUIPER_LOG_PATH=_build/kuiper-$(git describe --tags --always | sed 's/^v//g')-$(uname -s | tr "[A-Z]" "[a-z]")-amd64/log" >> $GITHUB_ENV
     - name: run edgex && kuiper
       run: |
         ./test/setup_env.sh
@@ -165,7 +165,7 @@ jobs:
       - name: build kuiper
         run: |
           make build_with_edgex
-          echo "KUIPER_LOG_PATH=_build/kuiper-$(git describe --tags --always)-$(uname -s | tr "[A-Z]" "[a-z]")-amd64/log" >> $GITHUB_ENV
+          echo "KUIPER_LOG_PATH=_build/kuiper-$(git describe --tags --always | sed 's/^v//g')-$(uname -s | tr "[A-Z]" "[a-z]")-amd64/log" >> $GITHUB_ENV
       - name: run edgex && kuiper
         env:
           KUIPER__STORE__TYPE: redis
@@ -280,7 +280,7 @@ jobs:
         KUBECONFIG: "/etc/rancher/k3s/k3s.yaml"
       timeout-minutes: 5
       run: |
-        version=$(git describe --tags --always)
+        version=$(git describe --tags --always | sed 's/^v//g')
         emqx_address=$(kubectl get svc --namespace default emqx -o jsonpath="{.spec.clusterIP}")
 
         sudo docker save lfedge/ekuiper:$version -o kuier.tar.gz

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 BUILD_PATH ?= _build
 PACKAGES_PATH ?= _packages
 
-VERSION := $(shell git describe --tags --always)
+VERSION := $(shell git describe --tags --always | sed 's/^v//g')
 ARCH := $(shell go env GOARCH)
 OS := $(shell go env GOOS)
 PACKAGE_NAME := kuiper-$(VERSION)-$(OS)-$(ARCH)

diff --git a/app/README.md b/app/README.md
@@ -5,7 +5,7 @@ If you need to compile from source, please follow these instructions.
 3. Copy the `etc` folder from the parent directory to the current directory, `cp -r etc app`.
 4. Go to the app directory, and start packaging.
    ``` bash
-   ver=$(git describe --tags --always)
+   ver=$(git describe --tags --always | sed 's/^v//g')
    fyne package -os android/arm64 -name ekuiper -metadata version=$ver -release -appID github.com.lfedge.ekuiper -icon icon.png
    ```
 5. If all goes well you'll get `ekuiper.apk`.

diff --git a/build-plugins.sh b/build-plugins.sh
@@ -21,7 +21,7 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
 
 PLUGIN_TYPE=$1
 PLUGIN_NAME=$2
-VERSION=$(git describe --tags --always)
+VERSION=$(git describe --tags --always | sed 's/^v//g')
 OS=$(sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g')
 
 pre(){

diff --git a/deploy/docker/Dockerfile-dev b/deploy/docker/Dockerfile-dev
@@ -23,7 +23,7 @@ RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN make build_with_edgex_and_script \
-    && ln -s /go/kuiper/_build/kuiper-$(git describe --tags --always)-$(go env GOOS)-$(go env GOARCH) /kuiper
+    && ln -s /go/kuiper/_build/kuiper-$(git describe --tags --always | sed 's/^v//g')-$(go env GOOS)-$(go env GOARCH) /kuiper
 
 RUN ln -s /go/kuiper/deploy/docker/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 

diff --git a/deploy/packages/Makefile b/deploy/packages/Makefile
@@ -5,7 +5,7 @@ ifneq ($(shell uname -s),Linux)
 	exit
 endif
 # The version-release used for package
-export PKG_VSN := $(shell git describe --tags --always)
+export PKG_VSN := $(shell git describe --tags --always | sed 's/^v//g')
 
 ifneq ($(shell cat /etc/*-release |grep -o -i centos),)
 	ID := centos

diff --git a/test/run_jmeter.sh b/test/run_jmeter.sh
@@ -52,7 +52,7 @@ downloadjar "/opt/jmeter/lib/commons-lang-2.5.jar" https://repo1.maven.org/maven
 downloadjar "/opt/jmeter/lib/commons-logging-1.1.1.jar" https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
 downloadjar "/opt/jmeter/lib/ezmorph-1.0.6.jar" https://repo1.maven.org/maven2/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar
 
-ver=`git describe --tags --always`
+ver=`git describe --tags --always | sed 's/^v//g'`
 os=`uname -s | tr "[A-Z]" "[a-z]"`
 base_dir=_build/kuiper-"$ver"-"$os"-amd64
 fvt_dir=`pwd`

diff --git a/test/start_kuiper.sh b/test/start_kuiper.sh
@@ -27,7 +27,7 @@ else
   done
 fi
 
-ver=`git describe --tags --always`
+ver=`git describe --tags --always | sed 's/^v//g'`
 os=`uname -s | tr "[A-Z]" "[a-z]"`
 base_dir=_build/kuiper-"$ver"-"$os"-amd64