Open platform to collect and prioritize feedback
Build version update (#1302)
Matt Robertsfba51b6050e7
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.ymlindex 60b2bd28f..53c2baa8a 100644--- a/.github/workflows/publish.yml+++ b/.github/workflows/publish.yml@@ -65,7 +65,9 @@ jobs:with:push: truecontext: .- build-args: COMMITHASH=${{ github.event.workflow_run.head_sha }}+ build-args: |+ COMMITHASH=${{ github.event.workflow_run.head_sha }}+ VERSION=${{ github.event.workflow_run.display_title }}platforms: linux/amd64,linux/arm64/v8tags: getfider/fider:${{ github.event.workflow_run.display_title }}cache-from: type=ghadiff --git a/Dockerfile b/Dockerfileindex 5777c0028..3f18ec462 100644--- a/Dockerfile+++ b/Dockerfile@@ -17,7 +17,8 @@ RUN go mod downloadCOPY . ./ARG COMMITHASH-RUN COMMITHASH=${COMMITHASH} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build-server+ARG VERSION+RUN COMMITHASH=${COMMITHASH} VERSION=${VERSION} GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build-server#################### UI Build Step#################diff --git a/Makefile b/Makefileindex ed69180ed..2be0e4d7a 100644--- a/Makefile+++ b/Makefile@@ -3,6 +3,7 @@## For more information, refer to https://www.thapaliya.com/en/writings/well-documented-makefiles/LDFLAGS += -X github.com/getfider/fider/app/pkg/env.commithash=${COMMITHASH}+LDFLAGS += -X github.com/getfider/fider/app/pkg/env.version=${VERSION}diff --git a/app/pkg/env/env.go b/app/pkg/env/env.goindex cb1327846..8015af06f 100644--- a/app/pkg/env/env.go+++ b/app/pkg/env/env.go@@ -16,17 +16,22 @@ import ()var (- // this value is set by the CI build+ // these values are set by the CI buildcommithash = ""- version = "0.22.0"+ version = "")func Version() string {+ v := version+ if v == "" {+ v = "dev"+ }+if commithash == "" {- return fmt.Sprintf("%s-dev", version)+ return v}- return fmt.Sprintf("%s-%s", version, commithash)+ return fmt.Sprintf("%s-%s", v, commithash)}type config struct {@@ -49,7 +54,7 @@ type config struct {Locale string `env:"LOCALE,default=en"`JWTSecret string `env:"JWT_SECRET,required"`PostCreationWithTagsEnabled bool `env:"POST_CREATION_WITH_TAGS_ENABLED,default=false"`- Paddle struct {+ Paddle struct {IsSandbox bool `env:"PADDLE_SANDBOX,default=false"`VendorID string `env:"PADDLE_VENDOR_ID"`VendorAuthCode string `env:"PADDLE_VENDOR_AUTHCODE"`