hbofficial-1005 commited on
Commit
163dae1
·
1 Parent(s): 84d8be6

Updated pipeline to avoid deployment issues

Browse files
Files changed (1) hide show
  1. .github/workflows/ci-cd.yml +19 -19
.github/workflows/ci-cd.yml CHANGED
@@ -84,25 +84,25 @@ jobs:
84
  git checkout main
85
  git merge --no-ff origin/develop
86
  git push origin main
87
-
88
  sync-develop:
89
- needs: merge-to-main
90
- runs-on: ubuntu-latest
91
- steps:
92
- - name: Checkout Repository
93
- uses: actions/checkout@v3
94
- with:
95
- fetch-depth: 0
96
 
97
- - name: Set up Git authentication
98
- run: |
99
- git config --global user.name "GitHub Actions"
100
- git config --global user.email "[email protected]"
101
- git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
102
 
103
- - name: Sync Develop with Main
104
- run: |
105
- git fetch origin
106
- git checkout develop
107
- git merge --no-ff origin/main
108
- git push origin develop
 
84
  git checkout main
85
  git merge --no-ff origin/develop
86
  git push origin main
87
+
88
  sync-develop:
89
+ needs: merge-to-main
90
+ runs-on: ubuntu-latest
91
+ steps:
92
+ - name: Checkout Repository
93
+ uses: actions/checkout@v3
94
+ with:
95
+ fetch-depth: 0
96
 
97
+ - name: Set up Git authentication
98
+ run: |
99
+ git config --global user.name "GitHub Actions"
100
+ git config --global user.email "[email protected]"
101
+ git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
102
 
103
+ - name: Sync Develop with Main
104
+ run: |
105
+ git fetch origin
106
+ git checkout develop
107
+ git merge --no-ff origin/main
108
+ git push origin develop