Merge remote-tracking branch 'origin/main' into ui-color-palette-404

a-ng-d · Jul 9, 2024 · ec8b714 · ec8b714
2 parents 9e20963 + 022243f
commit ec8b714
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,14 +18,26 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Set tag and release name
+      id: set_vars
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      run: |
+        if [[ "${{ github.event_name }}" == "push" ]]; then
+          echo "TAG_NAME=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+          echo "RELEASE_NAME=UI Color Palette ${GITHUB_REF_NAME}" >> $GITHUB_ENV
+        else
+          echo "TAG_NAME=${{ github.event.pull_request.milestone }}" >> $GITHUB_ENV
+          echo "RELEASE_NAME=UI Color Palette ${{ github.event.pull_request.milestone }} • ${{ github.event.pull_request.title}}" >> $GITHUB_ENV
+        fi
+
     - name: Create release
-      id: create_release
       uses: actions/create-release@v1
       env:
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
       with:
-        tag_name: ${{ github.event.pull_request.milestone }}
-        release_name: UI Color Palette ${{ github.event.pull_request.milestone }} • ${{ github.event.pull_request.title}}
+        tag_name: ${{ env.TAG_NAME }}
+        release_name: ${{ env.RELEASE_NAME }}
         body: |
           ## What's Changed
           [Friendly release note](https://ui-color-palette.canny.io/changelog/${{ github.ref }})・[Full Changelog](https://github.com/inVoltag/figma-ui-color-palette/commits/${{ github.ref }})

diff --git a/src/utils/config.ts b/src/utils/config.ts
@@ -1,4 +1,5 @@
-import { Feature } from '../types/app'
+import { Feature } from '../types/app';
+
 
 export const trialTime = 72
 export const oldTrialTime = 48
@@ -958,4 +959,4 @@ export const features: Array<Feature> = [
   },
 ]
 
-export default features
+export default features