diff --git a/.forgejo/workflows/build-and-release.yaml b/.forgejo/workflows/build-and-release.yaml index 3351bbe..6488a39 100644 --- a/.forgejo/workflows/build-and-release.yaml +++ b/.forgejo/workflows/build-and-release.yaml @@ -7,7 +7,7 @@ jobs: steps: - run: apk add --no-cache nodejs git - name: login to container registry - run: echo "${{ secrets.PACKAGE_PUBLISH_TOKEN }}" | docker login --username finn --password-stdin git.janky.solutions + run: echo "${{ secrets.PACKAGE_PUBLISH_TOKEN }}" | docker login --username ${{ secrets.PACKAGE_PUBLISH_USER }} --password-stdin git.janky.solutions - name: gather metadata for container image tags uses: https://github.com/docker/metadata-action@v5 id: meta @@ -20,7 +20,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: true + push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }} build-args: | VERSION_STRING=${{ env.GITHUB_REF_NAME }} - name: update hassio-addons diff --git a/config/version.go b/config/version.go index d611b7c..c718d59 100644 --- a/config/version.go +++ b/config/version.go @@ -26,5 +26,9 @@ func init() { break } } + + if Version == "" { + Version = "development" + } } } diff --git a/frontend/frontend.go b/frontend/frontend.go index 526381c..8aa240d 100644 --- a/frontend/frontend.go +++ b/frontend/frontend.go @@ -2,7 +2,6 @@ package frontend import ( "embed" - "fmt" "html/template" "io/fs" "time" @@ -20,7 +19,7 @@ var ( Templates *template.Template funcs = template.FuncMap{ - "version": func() string { return fmt.Sprintf("better-zwave-locks %s", config.Version) }, + "version": func() string { return config.Version }, "time_since": func(t time.Time) string { return time.Since(t).Round(time.Second).String() }, } ) diff --git a/frontend/header.html b/frontend/header.html index 84d62b3..d5fcf75 100644 --- a/frontend/header.html +++ b/frontend/header.html @@ -5,7 +5,7 @@
{{ if eq .Name "" }}Lock #{{ .ZwaveDeviceID }}{{ else }}{{ .Name }}{{ end }}
+ + {{ end }} + {{ template "footer.html" }} diff --git a/frontend/lock-code-edit.html b/frontend/lock-code-edit.html index e996ff3..12750fa 100644 --- a/frontend/lock-code-edit.html +++ b/frontend/lock-code-edit.html @@ -2,7 +2,7 @@