(fix): Use github.ref_name (#3996)

fern-api · Jul 5, 2024 · 9d86da5 · 9d86da5
1 parent 8620c2c
commit 9d86da5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
@@ -43,7 +43,7 @@ jobs:
       YARN_NPM_AUTH_TOKEN: ${{ secrets.FERN_NPM_TOKEN }}
       AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }}
       AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
-      POSTHOG_PROJECT_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
+      POSTHOG_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -79,7 +79,7 @@ jobs:
       YARN_NPM_AUTH_TOKEN: ${{ secrets.FERN_NPM_TOKEN }}
       AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }}
       AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
-      POSTHOG_PROJECT_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
+      POSTHOG_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -93,11 +93,11 @@ jobs:
         run: yarn install
       - name: Print version
         run: |
-          git_version="$(./scripts/git-version.sh)"
+          git_version=${{ github.ref_name }}
           echo Publishing version: "${git_version}"
       - name: Add version to package.json's
         run: |
-          git_version="$(./scripts/git-version.sh)"
+          git_version=${{ github.ref_name }}
           yarn mrlint version "$git_version"
       - name: Update yarn.lock with new versions
         run: yarn
@@ -118,7 +118,7 @@ jobs:
       YARN_NPM_AUTH_TOKEN: ${{ secrets.FERN_NPM_TOKEN }}
       AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }}
       AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
-      POSTHOG_PROJECT_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
+      POSTHOG_API_KEY: ${{ secrets.POSTHOG_PROJECT_API_KEY }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -132,11 +132,11 @@ jobs:
         run: yarn install
       - name: Print version
         run: |
-          git_version="$(./scripts/git-version.sh)"
+          git_version=${{ github.ref_name }}
           echo Publishing version: "${git_version}"
       - name: Add version to package.json's
         run: |
-          git_version="$(./scripts/git-version.sh)"
+          git_version=${{ github.ref_name }}
           yarn mrlint version "$git_version"
       - name: Update yarn.lock with new versions
         run: yarn

diff --git a/scripts/git-version.sh b/scripts/git-version.sh
@@ -1,13 +1,8 @@
 #!/usr/bin/env bash
 
-if [[ -n "$CIRCLE_TAG" ]]; then
-	echo "$CIRCLE_TAG"
-	exit 0
-fi
-
 # if the current commit is tagged, then should then ignore the tag
 tag="$(git describe --exact-match --tags HEAD 2> /dev/null || :)"
 if [[ -n "$tag" ]]; then
 	exclude_param="--exclude $tag"
 fi
-git describe --tags --always --first-parent $exclude_param
+git describe --tags --always --first-parent $exclude_param