Browse Source

Tweak merge

Neil MacDougall 2 months ago
parent
commit
b1879721a2
2 changed files with 2 additions and 3 deletions
  1. 2 2
      .github/workflows/sync-extensions.yml
  2. 0 1
      manifest.json

+ 2 - 2
.github/workflows/sync-extensions.yml

@@ -69,10 +69,10 @@ jobs:
           # Store the PR number as an output
           echo "PR_NUMBER=$pr_number" >> $GITHUB_ENV
 
-      - name: Merge Pull Request
+      - name: Merge Pull Request when approved
         run: |
           # Merge the PR using the GitHub CLI
-          gh pr merge ${{ env.PR_NUMBER }} --admin --delete-branch --merge --repo ${{ github.repository }}
+          gh pr merge ${{ env.PR_NUMBER }} --auto --delete-branch --merge --repo ${{ github.repository }}
   
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.5.0

+ 0 - 1
manifest.json

@@ -1,5 +1,4 @@
 {
-  "trigger": 6,
   "extensions": {
     "cloud-casa-extension": {
       "repo": "catalogicsoftware/cloudcasa-rancher-extension",