Merge pull request #81 from StackVista/fix-releasenotes

Fix full build including release
StackVista · May 16, 2024 · 4b3c54a · 4b3c54a
2 parents 31e3a9d + 2526248
commit 4b3c54a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 65 deletions.
diff --git a/.github/actions/gobase/action.yml b/.github/actions/gobase/action.yml
diff --git a/.github/actions/quay/action.yml b/.github/actions/quay/action.yml
@@ -16,11 +16,12 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Log in
-      shell: bash
-      run: |
-        echo "${{ env.QUAY_PASSWORD }}" | docker login --username=${{ env.QUAY_USER }} --password-stdin quay.io
-
+    - name: Log in to the Container registry
+      uses: docker/login-action@v3
+      with:
+        registry: quay.io
+        username: ${{ env.QUAY_USER }}
+        password: ${{ env.QUAY_PASSWORD }}
     - name: Run command
       shell: bash
       run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -110,49 +110,57 @@ jobs:
     env:
       TAG: ${{ github.ref_name }}
       S3_BUCKET: "s3://cli-dl.stackstate.com/stackstate-cli/"
-
+      QUAY_USER: ${{ secrets.QUAY_USER }}
+      QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: 1.22
-      - name: Generate release notes
-        uses: addnab/docker-run-action@v3
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
         with:
-          image: stackstate/go-rk:v0.2.4
           registry: quay.io
           username: ${{ secrets.QUAY_USER }}
           password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Generate release notes
+        uses: ./.github/actions/quay
+        with:
+          image: quay.io/stackstate/go-rk:v0.2.4
           options: >
-            -v /var/run/docker.sock:/var/run/docker.sock
-            -v ${{ github.workspace }}:/workspace
             -e RK_JIRA_PROJECT=STAC
             -e RK_JIRA_URL=https://stackstate.atlassian.net
             -e RK_JIRA_USER=${{ secrets.JIRA_USER }}
             -e RK_JIRA_TOKEN=${{ secrets.JIRA_TOKEN }}
-          run: |
-            go-rk release-notes --fix-version cli2-${{ env.TAG }} --output-file /workspace/release-notes.md --title "CLI ${{ env.TAG }}"
+          entrypoint: go-rk
+          run: >
+            release-notes
+            --fix-version cli2-${{ env.TAG }}
+            --output-file /workspace/release-notes.md
+            --title "CLI ${{ env.TAG }}"
       - name: Save release notes
         uses: actions/upload-artifact@v3
         with:
           name: release-notes
           path: release-notes.md
       - name: Generate JSON release notes
-        uses: addnab/docker-run-action@v3
+        uses: ./.github/actions/quay
         with:
-          image: stackstate/go-rk:v0.2.4
-          registry: quay.io
-          username: ${{ secrets.QUAY_USER }}
-          password: ${{ secrets.QUAY_PASSWORD }}
+          image: quay.io/stackstate/go-rk:v0.2.4
           options: >
-            -v /var/run/docker.sock:/var/run/docker.sock
-            -v ${{ github.workspace }}:/workspace
             -e RK_JIRA_PROJECT=STAC
             -e RK_JIRA_URL=https://stackstate.atlassian.net
             -e RK_JIRA_USER=${{ secrets.JIRA_USER }}
             -e RK_JIRA_TOKEN=${{ secrets.JIRA_TOKEN }}
-          run: |
-            go-rk release-notes --fix-version cli2-${{ env.TAG }} -o json --output-file /workspace/release-notes.json --title "CLI ${{ env.TAG }}"
+          entrypoint: go-rk
+          run: >
+            release-notes
+            --fix-version cli2-${{ env.TAG }}
+            -o json
+            --output-file /workspace/release-notes.json
+            --title "CLI ${{ env.TAG }}"
       - name: Save JSON release notes
         uses: actions/upload-artifact@v3
         with:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -42,25 +42,6 @@ blobs:
     bucket: cli-dl.stackstate.com
     ids:
       - stackstate-cli
-brews:
-- name: stackstate-cli
-  ids:
-    - stackstate-cli
-  repository:
-    owner: stackvista
-    name: homebrew-tap
-  commit_author:
-    name: stackstatebot
-    email: sts-admin@stackstate.com
-  directory: Formula
-  install: |
-    bin.install "sts"
-  test: |
-    system "#{bin}/sts", "version"
-  description: StackState CLI
-  homepage: https://docs.stackstate.com
-  url_template: https://dl.stackstate.com/{{ .ProjectName }}/{{.Tag}}/{{ .ArtifactName }}
-  caveats: "Run `sts` to get going!"
 dockers:
 - image_templates:
   - "stackstate/stackstate-cli2:{{ .Version }}-x86_64"