Merge remote-tracking branch 'origin/main' into gh-pages

jhipster · Nov 3, 2024 · 0dcdf6b · 0dcdf6b
2 parents 414ad0c + 87cfff7
commit 0dcdf6b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
@@ -59,6 +59,12 @@ jobs:
           echo "merge_status=up_to_date" >> $GITHUB_ENV
         fi
 
+    - name: Remove workflow files
+      if: ${{ env.branch_exists != 'true' && env.merge_status == 'merged' }}
+      run: |
+        git rm -r --cached .github/workflows/deploy.yml || true
+        git commit -m "Remove upstream workflow files" || true
+        
     - name: Commit merge conflicts
       if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }}
       run: git commit -a --no-edit || true