From 168f47698cb646d745787948bd5b0fa29b5220d4 Mon Sep 17 00:00:00 2001 From: Anantha Kumaran Date: Mon, 26 Aug 2024 12:26:07 +0530 Subject: [PATCH] Fix docker tags --- .github/workflows/docker.yml | 36 ++++++++++++++++++++---- .github/workflows/linux-app.yml | 6 ++-- CHANGELOG.md | 2 +- Dockerfile.all | 2 +- Dockerfile.beancount | 2 +- Dockerfile.hledger | 2 +- cmd/version.go | 2 +- desktop/build/linux/DEBIAN/control | 2 +- desktop/main.go | 2 +- desktop/wails.json | 2 +- flake.nix | 2 +- src/routes/(app)/more/about/+page.svelte | 2 +- 12 files changed, 43 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e306cd0b..0af9f224 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -29,27 +29,51 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + - id: meta-hledger + uses: docker/metadata-action@v5 + with: + images: ananthakumaran/paisa + flavor: | + latest=auto + prefix= + suffix=-hledger,onlatest=true - uses: docker/build-push-action@v5 with: context: . platforms: linux/amd64,linux/arm64 file: ./Dockerfile.hledger push: true - tags: ${{ steps.meta.outputs.tags }}-hledger - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ steps.meta-hledger.outputs.tags }} + labels: ${{ steps.meta-hledger.outputs.labels }} + - id: meta-beancount + uses: docker/metadata-action@v5 + with: + images: ananthakumaran/paisa + flavor: | + latest=auto + prefix= + suffix=-beancount,onlatest=true - uses: docker/build-push-action@v5 with: context: . platforms: linux/amd64,linux/arm64 file: ./Dockerfile.beancount push: true - tags: ${{ steps.meta.outputs.tags }}-beancount - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ steps.meta-beancount.outputs.tags }} + labels: ${{ steps.meta-beancount.outputs.labels }} + - id: meta-all + uses: docker/metadata-action@v5 + with: + images: ananthakumaran/paisa + flavor: | + latest=auto + prefix= + suffix=-all,onlatest=true - uses: docker/build-push-action@v5 with: context: . platforms: linux/amd64,linux/arm64 file: ./Dockerfile.all push: true - tags: ${{ steps.meta.outputs.tags }}-all - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ steps.meta-all.outputs.tags }} + labels: ${{ steps.meta-all.outputs.labels }} diff --git a/.github/workflows/linux-app.yml b/.github/workflows/linux-app.yml index 79ab756e..714e7338 100644 --- a/.github/workflows/linux-app.yml +++ b/.github/workflows/linux-app.yml @@ -34,10 +34,10 @@ jobs: wails doctor wails build -tags webkit2_40 cp build/bin/Paisa build/linux/usr/local/bin - cp -r build/linux paisa_0.6.7_amd64 - dpkg --build paisa_0.6.7_amd64 + cp -r build/linux paisa_0.6.8_amd64 + dpkg --build paisa_0.6.8_amd64 cd .. - mv desktop/paisa_0.6.7_amd64.deb paisa-app-linux-amd64.deb + mv desktop/paisa_0.6.8_amd64.deb paisa-app-linux-amd64.deb - name: Release uses: softprops/action-gh-release@v1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index c3876802..361dd72b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -### 0.6.7 (2024-08-26) +### 0.6.8 (2024-08-26) * Add [docker image variant](https://github.com/ananthakumaran/paisa/pull/274) for hledger and beancount * Bug fixes diff --git a/Dockerfile.all b/Dockerfile.all index fd68fc99..6111d1ee 100644 --- a/Dockerfile.all +++ b/Dockerfile.all @@ -1,4 +1,4 @@ -FROM docker.io/ananthakumaran/paisa:latest +FROM docker.io/ananthakumaran/paisa:v0.6.8 RUN apk --no-cache add hledger beancount diff --git a/Dockerfile.beancount b/Dockerfile.beancount index 4ec89737..f9429c94 100644 --- a/Dockerfile.beancount +++ b/Dockerfile.beancount @@ -1,4 +1,4 @@ -FROM docker.io/ananthakumaran/paisa:latest +FROM docker.io/ananthakumaran/paisa:v0.6.8 RUN apk --no-cache add beancount diff --git a/Dockerfile.hledger b/Dockerfile.hledger index 3d7c68cb..c82a9385 100644 --- a/Dockerfile.hledger +++ b/Dockerfile.hledger @@ -1,4 +1,4 @@ -FROM docker.io/ananthakumaran/paisa:latest +FROM docker.io/ananthakumaran/paisa:v0.6.8 RUN apk --no-cache add hledger diff --git a/cmd/version.go b/cmd/version.go index d4074d42..be871901 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -9,7 +9,7 @@ var versionCmd = &cobra.Command{ Use: "version", Short: "Print the version information", Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Version:", "0.6.7") + fmt.Println("Version:", "0.6.8") }, } diff --git a/desktop/build/linux/DEBIAN/control b/desktop/build/linux/DEBIAN/control index 6ba3f259..a22fdc26 100644 --- a/desktop/build/linux/DEBIAN/control +++ b/desktop/build/linux/DEBIAN/control @@ -1,5 +1,5 @@ Package: paisa -Version: 0.6.7 +Version: 0.6.8 Section: misc Priority: optional Architecture: amd64 diff --git a/desktop/main.go b/desktop/main.go index 30e07995..6c5b0d0a 100644 --- a/desktop/main.go +++ b/desktop/main.go @@ -61,7 +61,7 @@ func main() { Mac: &mac.Options{ About: &mac.AboutInfo{ Title: "Paisa", - Message: "Version 0.6.7 \nCopyright © 2022 - 2024 \nAnantha Kumaran", + Message: "Version 0.6.8 \nCopyright © 2022 - 2024 \nAnantha Kumaran", Icon: icon, }, }, diff --git a/desktop/wails.json b/desktop/wails.json index 334601aa..eb6d3903 100644 --- a/desktop/wails.json +++ b/desktop/wails.json @@ -11,7 +11,7 @@ "Info": { "companyName": "Paisa", "productName": "Paisa", - "productVersion": "0.6.7", + "productVersion": "0.6.8", "copyright": "Copyright © 2022 - 2024 Anantha Kumaran", "comments": "Personal finance manager" } diff --git a/flake.nix b/flake.nix index da8e7b5a..60ae6dd2 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ packages.default = pkgs.buildGoModule { pname = "paisa-cli"; meta.mainProgram = "paisa"; - version = "0.6.7"; + version = "0.6.8"; src = ./.; diff --git a/src/routes/(app)/more/about/+page.svelte b/src/routes/(app)/more/about/+page.svelte index 259a8fa3..6b024529 100644 --- a/src/routes/(app)/more/about/+page.svelte +++ b/src/routes/(app)/more/about/+page.svelte @@ -43,7 +43,7 @@
Paisa
- Version: 0.6.7 + Version: 0.6.8