From d785a791dd715f1da83ae0a615ccf7050092e75c Mon Sep 17 00:00:00 2001
From: Christina Holland <chholland@google.com>
Date: Tue, 30 Apr 2024 12:44:46 -0700
Subject: [PATCH] put Github release step in publish workflow (#117)

---
 .github/workflows/gh-release.yml | 40 --------------------------------
 .github/workflows/publish.yml    | 13 ++++++++++-
 2 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 .github/workflows/gh-release.yml

diff --git a/.github/workflows/gh-release.yml b/.github/workflows/gh-release.yml
deleted file mode 100644
index 66881bb0..00000000
--- a/.github/workflows/gh-release.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2024 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Create Github release
-
-on:
-  push:
-    tags:
-      - '*'
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    name: Release pushed tag
-    if: ${{ contains(github.ref_name, 'google/generative-ai') }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create Github release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-        run: |
-          gh release create "$tag" \
-              --repo="$GITHUB_REPOSITORY" \
-              --title="$tag" \
-              --generate-notes \
-              --verify-tag
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index db4b616a..b811d3d3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -54,7 +54,7 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Publish
+      - name: NPM publish
         run: yarn changeset publish
 
       - name: Git tags
@@ -62,3 +62,14 @@ jobs:
         run: |
           git for-each-ref refs/tags
           git push --follow-tags
+
+      - name: Create Github release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          NEWEST_TAG=$(git describe --tags --abbrev=0)
+          gh release create "$NEWEST_TAG" \
+              --repo="$GITHUB_REPOSITORY" \
+              --title="$NEWEST_TAG" \
+              --generate-notes \
+              --verify-tag