🌀 Add pull strategy to release process

Check EndBug/add-and-commit#72
AcompanhaLegis · Nov 11, 2020 · 44a64e3 · 44a64e3
1 parent a685e48
commit 44a64e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,17 +23,15 @@ jobs:
         uses: tyankatsu0105/read-package-version-actions@v1
         id: package-version
 
-      - name: Set git config
-        run: git config pull.rebase true
-
       - name: Commit changes
         uses: EndBug/add-and-commit@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           message: ':package: Release v${{ steps.package-version.outputs.version }}'
-          add: 'dist/* --force'
+          add: 'dist/*'
           branch: 'v${{ steps.package-version.outputs.version }}'
+          pull_strategy: '--no-rebase'
 
       - name: NPM Release
         uses: mikeal/merge-release@master

diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,4 @@ node_modules/*
 *.sw*
 .idea
 .cache
-dist
 *.log
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,4 @@ node_modules/* @@
     *.sw*
     .idea
     .cache
-    dist
     *.log