Update ci.yml
Browse files- .github/workflows/ci.yml +4 -0
.github/workflows/ci.yml
CHANGED
|
@@ -42,6 +42,8 @@ jobs:
|
|
| 42 |
git fetch origin
|
| 43 |
git checkout develop
|
| 44 |
git merge --no-ff "${{ github.ref }}"
|
|
|
|
|
|
|
| 45 |
git push origin develop
|
| 46 |
|
| 47 |
merge-to-main:
|
|
@@ -64,6 +66,8 @@ jobs:
|
|
| 64 |
git fetch origin
|
| 65 |
git checkout main
|
| 66 |
git merge --no-ff origin/develop
|
|
|
|
|
|
|
| 67 |
git push origin main
|
| 68 |
|
| 69 |
docker-build:
|
|
|
|
| 42 |
git fetch origin
|
| 43 |
git checkout develop
|
| 44 |
git merge --no-ff "${{ github.ref }}"
|
| 45 |
+
# Update remote URL to use GITHUB_TOKEN for pushing:
|
| 46 |
+
git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git
|
| 47 |
git push origin develop
|
| 48 |
|
| 49 |
merge-to-main:
|
|
|
|
| 66 |
git fetch origin
|
| 67 |
git checkout main
|
| 68 |
git merge --no-ff origin/develop
|
| 69 |
+
# Update remote URL to use GITHUB_TOKEN for pushing:
|
| 70 |
+
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
|
| 71 |
git push origin main
|
| 72 |
|
| 73 |
docker-build:
|