chore: merge in master on update dev client

mittwald · Jun 11, 2024 · b9eb311 · b9eb311
1 parent ca4fa62
commit b9eb311
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.github/workflows/update-client-dev.yml b/.github/workflows/update-client-dev.yml
@@ -40,13 +40,16 @@ jobs:
         if: github.ref != 'refs/heads/dev'
         run: git branch --track master origin/dev
 
+      - name: Merge in master ⛙
+        run: |
+          git merge origin master --strategy-option theirs
+
       - name: Update OpenAPI ⬇️
         if: github.ref == 'refs/heads/dev'
         run: |
           yarn nx run @mittwald/api-client:build:client-dev
           if [ $(git status --porcelain . | wc -l) -gt 0 ] ; then
             git add .
-            git merge origin master --strategy-option theirs
             yarn test
             git commit -m "chore: update generated development client";            
             git push origin