From bd540e25dc064e67a4a3a12cfe380da34fffbe97 Mon Sep 17 00:00:00 2001
From: Neil Twigg <neil@nats.io>
Date: Wed, 29 Jan 2025 10:08:07 +0000
Subject: [PATCH] Tweak action [ci skip]

Signed-off-by: Neil Twigg <neil@nats.io>
---
 .github/actions/nightly-release/action.yaml | 32 ++++-----------------
 .github/workflows/nightly.yaml              |  9 +-----
 .goreleaser-nightly.yml                     |  9 +++---
 3 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/.github/actions/nightly-release/action.yaml b/.github/actions/nightly-release/action.yaml
index d54cc0161b9..4ee9d1997b1 100644
--- a/.github/actions/nightly-release/action.yaml
+++ b/.github/actions/nightly-release/action.yaml
@@ -2,15 +2,6 @@ name: Nightly Docker Releaser
 description: Builds nightly docker images
 
 inputs:
-  go:
-    description: The version of go to build with
-    required: true
-
-  label:
-    description: The label to use for built images
-    required: false
-    default: nightly
-
   hub_username:
     description: Docker hub username
     required: true
@@ -26,12 +17,16 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Log in to Docker Hub
+      shell: bash
+      run: docker login -u "${{ inputs.hub_username }}" -p "${{ inputs.hub_password }}"
+
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.go }}"
+        go-version: "stable"
 
-    - name: goreleaser
+    - name: Build and push Docker images
       # Use commit hash here to avoid a re-tagging attack, as this is a third-party action
       # Commit 5742e2a039330cbb23ebf35f046f814d4c6ff811 = tag v5
       uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811
@@ -39,18 +34,3 @@ runs:
         workdir: "${{ inputs.workdir }}"
         version: latest
         args: release --snapshot --config .goreleaser-nightly.yml
-
-    - name: images
-      shell: bash
-      run: docker images
-
-    - name: docker_login
-      shell: bash
-      run: docker login -u "${{ inputs.hub_username }}" -p "${{ inputs.hub_password }}"
-
-    - name: docker_push
-      shell: bash
-      run: |
-        NDATE=$(date +%Y%m%d)
-        docker push synadia/nats-server:${{ inputs.label }}-${NDATE}
-        docker push synadia/nats-server:${{ inputs.label }}
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index faac2f88da2..b87ddaf17c8 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -3,14 +3,9 @@ on:
   workflow_dispatch:
     inputs:
       target:
-        description: "Override image branch (optional)"
+        description: "Override source branch (optional)"
         type: string
         required: false
-      label:
-        description: "Override tag label (optional)"
-        type: string
-        required: false
-        default: "nightly"
 
   schedule:
     - cron: "40 4 * * *"
@@ -27,8 +22,6 @@ jobs:
 
       - uses: ./src/github.com/nats-io/nats-server/.github/actions/nightly-release
         with:
-          go: "stable"
           workdir: src/github.com/nats-io/nats-server
-          label: ${{ inputs.label }}
           hub_username: "${{ secrets.DOCKER_USERNAME }}"
           hub_password: "${{ secrets.DOCKER_PASSWORD }}"
diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
index 6365b1204cd..308a5a22758 100644
--- a/.goreleaser-nightly.yml
+++ b/.goreleaser-nightly.yml
@@ -17,13 +17,12 @@ builds:
 dockers:
   - goos: linux
     goarch: amd64
-    skip_push: true
     dockerfile: docker/Dockerfile.nightly
     build_flag_templates:
-      - '--build-arg=VERSION={{ if index .Env "IMAGE_NAME"  }}{{ .Env.IMAGE_NAME }}{{ else if not (eq .Branch "main" "dev" "") }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}-{{ time "20060102" }}'
+      - '--build-arg=VERSION={{ if ne .Branch "main" "" }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}-{{ time "20060102" }}'
     image_templates:
-      - synadia/nats-server:{{.Version}}
-      - synadia/nats-server:{{ if index .Env "IMAGE_NAME"  }}{{ .Env.IMAGE_NAME }}{{ else if not (eq .Branch "main" "dev" "") }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}
+      - synadia/nats-server:{{ if ne .Branch "main" "" }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}
+      - synadia/nats-server:{{ if ne .Branch "main" "" }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}-{{ time "20060102" }}
     extra_files:
       - docker/nats-server.conf
 
@@ -32,4 +31,4 @@ checksum:
   algorithm: sha256
 
 snapshot:
-  name_template: '{{ if index .Env "IMAGE_NAME"  }}{{ .Env.IMAGE_NAME }}{{ else if not (eq .Branch "main" "dev" "") }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}-{{ time "20060102" }}'
+  name_template: '{{ if ne .Branch "main" "" }}{{ replace .Branch "/" "-" }}{{ else }}nightly{{ end }}-{{ time "20060102" }}'