ci: update x5

Bugs5382 · Jun 25, 2024 · 13698d3 · 13698d3
1 parent 11b8807
commit 13698d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/deploy-ci.yaml b/.github/workflows/deploy-ci.yaml
@@ -88,8 +88,8 @@ jobs:
           git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
           git fetch origin
           git checkout develop
-          git merge origin/main -m "chore: merge main into develop [ci skip]"
-          git push origin develop
+          git merge origin/main -m "chore(ci): merge main into develop [ci skip]"
+          git push -o ci.skip origin develop
   Docs:
     runs-on: ubuntu-latest
     needs: [ 'Release' ]