Merged MacOS and Linux releases into a single release

.forgejo/workflows/release.yaml

@@ -69,8 +69,8 @@ jobs:
           cd _site
           netlify deploy --dir docs --prod 
 
-  'Release MacOS':
-#    needs: Build
+  'Release':
+    needs: Build
     runs-on: macos
     steps:
       - name: Checkout
@@ -90,7 +90,7 @@ jobs:
           go install github.com/goreleaser/goreleaser/v2@v2.12.7
       - name: Release
         run: |
-          goreleaser release -f macos.goreleaser.yml --skip=validate --clean
+          goreleaser release -f goreleaser.yml --skip=validate --clean
         env:
           GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           HOMEBREW_TAP_PRIVATE_KEY: ${{ secrets.HOMEBREW_TAP_PRIVATE_KEY }}
@@ -99,26 +99,3 @@ jobs:
           MACOS_NOTARY_KEY: ${{ secrets.MACOS_NOTARY_KEY }}
           MACOS_NOTARY_KEY_ID: ${{ secrets.MACOS_NOTARY_KEY_ID }}
           MACOS_NOTARY_ISSUER_ID: ${{ secrets.MACOS_NOTARY_ISSUER_ID }}
-
-#  release-linux:
-#    needs: build
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#      - name: Setup Go
-#        uses: actions/setup-go@v3
-#        with:
-#          go-version: 1.22
-#      - name: Configure
-#        run: |
-#          git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika"
-#      - name: Release
-#        uses: goreleaser/goreleaser-action@v1
-#        if: startsWith(github.ref, 'refs/tags/')
-#        with:
-#          version: latest
-#          args: release -f linux.goreleaser.yml --skip=validate --clean
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          HOMEBREW_GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_TOKEN }}

goreleaser.yml

@@ -1,7 +1,7 @@
 version: 2
 
 builds:
-  - id: dynamo-browse
+  - id: dynamo-browse_macos
     targets:
       - darwin_amd64
       - darwin_arm64
@@ -9,12 +9,27 @@ builds:
       - CGO_ENABLED=1
     main: ./cmd/dynamo-browse/.
     binary: dynamo-browse
+  - id: dynamo-browse_linux
+    targets:
+      - linux_amd64
+      - linux_arm64
+    env:
+      - CGO_ENABLED=1
+    main: ./cmd/dynamo-browse/.
+    binary: dynamo-browse
 
+archives:
+  - id: tgz
+    wrap_in_directory: false
+    formats:
+      - tar.gz
+
+# MacOS Release: notarise and publish via Homebrew Tap
 notarize:
   macos:
     - enabled: true
       ids:
-        - dynamo-browse
+        - dynamo-browse_macos
       sign:
         certificate: "{{.Env.MACOS_SIGN_P12}}"
         password: "{{.Env.MACOS_SIGN_PASSWORD}}"
@@ -25,21 +40,10 @@ notarize:
         wait: true
         timeout: 20m
 
-archives:
-  - id: tgz
-    wrap_in_directory: false
-    formats:
-      - tar.gz
-
-release:
-  gitea:
-    owner: cmd
-    name: dynamo-browse
-  ids:
-    - tgz
-
 homebrew_casks:
   - name: dynamo-browse
+    ids:
+      - dynamo-browse_macos
     repository:
       owner: casks
       name: dynamo-browse
@@ -51,8 +55,31 @@ homebrew_casks:
     description: TUI tools for working with DynamoDB
     license: MIT
 
+# Linux releases: publish as deb and rpm packages
+nfpms:
+  - id: package_nfpms
+    package_name: audax
+    ids:
+      - dynamo-browse_linux
+    vendor: lmika
+    homepage: https://dynamo-browse.lmika.dev/
+    maintainer: Leon Mika <lmika@lmika.org>
+    description: TUI tools for working with DynamoDB
+    license: MIT
+    formats:
+      - deb
+      - rpm
+    bindir: /usr/local/bin
+
+release:
+  gitea:
+    owner: cmd
+    name: dynamo-browse
+  ids:
+    - tgz
+
 checksum:
-  name_template: 'checksums-macos.txt'
+  name_template: 'checksums.txt'
 
 snapshot:
   version_template: "{{ .Tag }}-next"
@@ -61,4 +88,4 @@ gitea_urls:
   api: https://lmika.dev/api/v1
   download: https://lmika.dev
   # set to true if you use a self-signed certificate
-  skip_tls_verify: false
+  skip_tls_verify: false

linux.goreleaser.yml

@@ -1,37 +0,0 @@
-builds:
-  - id: dynamo-browse
-    targets:
-      - windows_amd64
-      - linux_amd64
-    env:
-      - CGO_ENABLED=1
-    main: ./cmd/dynamo-browse/.
-    binary: dynamo-browse
-archives:
-  - id: zip
-    builds:
-      - dynamo-browse
-    wrap_in_directory: true
-    format_overrides:
-      - goos: windows
-        format: zip
-      - goos: linux
-        format: tar.gz
-nfpms:
-  - id: package_nfpms
-    package_name: audax
-    builds:
-      - dynamo-browse
-    vendor: lmika
-    homepage: https://dynamo-browse.lmika.dev/
-    maintainer: Leon Mika <lmika@lmika.org>
-    description: TUI tools for working with DynamoDB
-    license: MIT
-    formats:
-      - deb
-      - rpm
-    bindir: /usr/local/bin
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ .Tag }}-next"