fix: version is not parsed into build info

fix: Bump steve to fix the crd issue
fix: no need to new workflow file for release branch
2025-09-02 06:55:01 +00:00 · 2024-09-26 09:49:16 +08:00 · 2024-08-07 09:08:22 +08:00 · 2024-07-30 10:34:57 +08:00 · 2024-07-30 10:32:06 +08:00 · 2024-07-30 10:31:00 +08:00
5 changed files with 10 additions and 4 deletions
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -3,6 +3,7 @@ name: Push to Master
 on:
  push:
    branches:
+      - release/v*
      - main
    tags:
      - 'v*.*.*'  # Matches any tag that starts with 'v' and follows semantic versioning
@@ -50,6 +51,7 @@ jobs:
          IMAGE_OVERRIDE: ${{ vars.IMAGE || 'kube-explorer' }}
        run: |
          tag_name=latest;
+          if [[ ${GITHUB_REF} == refs/heads/release/* ]]; then tag_name=${GITHUB_REF#refs/heads/release/}-head; fi;
          if [[ ${GITHUB_REF} == refs/tags/* ]]; then tag_name=${GITHUB_REF#refs/tags/}; fi; 
          echo "image_name=${REPO_OVERRIDE}/${IMAGE_OVERRIDE}:${tag_name}" >> $GITHUB_OUTPUT;
      -
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -22,7 +22,7 @@ COPY --from=tools /app/release-notary /usr/local/bin/
 ENV CATTLE_DASHBOARD_UI_VERSION="v2.8.0-kube-explorer-ui-rc3"
 ENV CATTLE_API_UI_VERSION="1.1.11"

-ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS GOPROXY SKIP_COMPRESS GITHUB_REPOSITORY GITHUB_TOKEN
+ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS GOPROXY SKIP_COMPRESS GITHUB_REPOSITORY GITHUB_TOKEN GITHUB_REF
 ENV DAPPER_SOURCE /go/src/github.com/cnrancher/kube-explorer
 ENV DAPPER_OUTPUT ./bin ./dist
 ENV DAPPER_DOCKER_SOCKET true
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ replace k8s.io/client-go => k8s.io/client-go v0.30.1
 require (
 	github.com/gorilla/mux v1.8.1
 	github.com/rancher/apiserver v0.0.0-20240708202538-39a6f2535146
-	github.com/rancher/steve v0.0.0-20240709130809-47871606146c
+	github.com/rancher/steve v0.0.0-20240806133920-61be17faa3d2
 	github.com/rancher/wrangler/v3 v3.0.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/urfave/cli v1.22.15
--- a/go.sum
+++ b/go.sum
@@ -1029,8 +1029,8 @@ github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 h1:AlRMRs5mHJcdiK83
 github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9/go.mod h1:dyjfXBsNiroPWOdUZe7diUOUSLf6HQ/r2kEpwH/8zas=
 github.com/rancher/remotedialer v0.3.2 h1:kstZbRwPS5gPWpGg8VjEHT2poHtArs+Fc317YM8JCzU=
 github.com/rancher/remotedialer v0.3.2/go.mod h1:Ys004RpJuTLSm+k4aYUCoFiOOad37ubYev3TkOFg/5w=
-github.com/rancher/steve v0.0.0-20240709130809-47871606146c h1:PIaN0/KUyGcqEcT6GyjUidld2lgGkGxS4dmC3Je3dFs=
-github.com/rancher/steve v0.0.0-20240709130809-47871606146c/go.mod h1:Za4nSt0V6kIHRfUo6jTXKkv6ABMMCHINA8EzhzygCfk=
+github.com/rancher/steve v0.0.0-20240806133920-61be17faa3d2 h1:mmm2uQ1NsNCrr6jxq9eAdGxvaf+6061gV4BMvuhcT6I=
+github.com/rancher/steve v0.0.0-20240806133920-61be17faa3d2/go.mod h1:Za4nSt0V6kIHRfUo6jTXKkv6ABMMCHINA8EzhzygCfk=
 github.com/rancher/wrangler/v3 v3.0.0 h1:IHHCA+vrghJDPxjtLk4fmeSCFhNe9fFzLFj3m2B0YpA=
 github.com/rancher/wrangler/v3 v3.0.0/go.mod h1:Dfckuuq7MJk2JWVBDywRlZXMxEyPxHy4XqGrPEzu5Eg=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
--- a/scripts/version
+++ b/scripts/version
@@ -1,5 +1,9 @@
 #!/bin/bash

+if [[ ${GITHUB_REF} == refs/tags/* ]]; then
+    DRONE_TAG=${DRONE_TAG:-${GITHUB_REF#refs/tags/}}
+fi
+
 if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
    DIRTY="-dirty"
 fi
Author	SHA1	Message	Date
Yuxing Deng	2d512c0a72	fix: version is not parsed into build info	2024-09-26 09:49:16 +08:00
Yuxing Deng	5c987cd193	fix: Bump steve to fix the crd issue	2024-08-07 09:08:22 +08:00
Yuxing Deng	85925bbac7	fix: no need to new workflow file for release branch	2024-07-30 10:34:57 +08:00
Yuxing Deng	f435a24814	fix: Rename release branch ci name	2024-07-30 10:32:06 +08:00
Yuxing Deng	fb1f38e1ef	feat: Add release branch ci	2024-07-30 10:31:00 +08:00