Skip to content

Commit a39da6e

Browse files
Merge 72e9074 into master-ci
2 parents ba169bf + 72e9074 commit a39da6e

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/CD_dev-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,9 @@ jobs:
8080
git config user.email github-actions@github.com
8181
8282
git checkout dev-release
83-
8483
git pull origin dev-release
8584
86-
git merge master-ci
85+
git merge origin/master-ci
8786
8887
rm -rf LICENSE
8988
rm -rf README.md
@@ -93,7 +92,8 @@ jobs:
9392
9493
git add .
9594
96-
git diff-index --quiet HEAD || git commit -m "Sanitize dev-release"
95+
git diff-index --quiet HEAD || git commit -m "Merge master-ci into dev-release and remove unnecessary files"
96+
9797
git push origin dev-release
9898
9999
- name: Webhook

0 commit comments

Comments
 (0)