Merge branch 'main' into update-nav-settings

fuelviews · Nov 14, 2024 · 47a4b2c · 47a4b2c
2 parents fe1ff12 + 08b1fd3
commit 47a4b2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,6 +9,8 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+    ignore:
+      - dependency-name: "ralphjsmit/laravel-glide"
     target-branch: main
   - package-ecosystem: 'github-actions'
     directory: '/'

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
   release:
-    types: [released]
+    types: [published]
 
 permissions:
   contents: write
@@ -19,27 +19,27 @@ jobs:
         id: get_workflow_token
         uses: peter-murray/workflow-application-token-action@v4
         with:
-          application_id: ${{ vars.FUELVIEWS_BOT_APP_ID}}
+          application_id: ${{ vars.FUELVIEWS_BOT_APP_ID }}
           application_private_key: ${{ secrets.FUELVIEWS_BOT_APP_PRIVATE_KEY }}
 
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.release.target_commitish }}
+          ref: 'main'
           token: ${{ steps.get_workflow_token.outputs.token }}
 
       - name: Update Changelog
         uses: stefanzweifel/changelog-updater-action@v1
         with:
-          latest-version: ${{ github.event.release.name }}
+          latest-version: ${{ github.event.release.tag_name }}
           release-notes: ${{ github.event.release.body }}
 
-      - name: Amend latest commit with updated CHANGELOG
+      - name: Commit updated CHANGELOG
+        env:
+          GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
         run: |
           git config user.name "fuelviews-app[bot]"
           git config user.email "fuelviews-app[bot]@users.noreply.github.com"
           git add CHANGELOG.md
           git commit --amend --no-edit
           git push origin main --force-with-lease
-        env:
-          GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}