Merge pull request #154 from kossiitkgp/fix-workflow

[v2] Fix workflow
kossiitkgp · Jul 20, 2023 · 2be002b · 2be002b
2 parents 0a60dfa + 9624eff
commit 2be002b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/swagger_docs.yml b/.github/workflows/swagger_docs.yml
@@ -44,9 +44,13 @@ jobs:
 
       - name: Merge the changes from main branch to docs branch
         run: |
+          git config user.email "[email protected]"
+          git config user.name "koss-service"
+          git config gpg.format ssh
+          git config user.signingkey ~/.ssh/koss-service.pub
           git checkout -b docs || git checkout docs
-          git pull origin docs
-          git merge 'origin/${{ github.ref_name }}'
+          git pull -S origin docs
+          git merge -S 'origin/${{ github.ref_name }}'
 
       - name: Generate swagger.yaml and exit if no changes
         run: |

diff --git a/.github/workflows/test_and_lint.yml b/.github/workflows/test_and_lint.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - v2-dev
   pull_request:
 
 jobs:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ on: @@
       push:
         branches:
           - main
-          - v2-dev
       pull_request:
     jobs:
@@ Expand Down @@