diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 15a6e00..40d8e2c 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -78,21 +78,11 @@ jobs: run: | git config user.name github-actions git config user.email github-actions@github.com - git fetch origin git checkout dev-release - git ls-files -d | xargs git checkout -- - git pull origin dev-release --rebase --autostash - git checkout master-ci - - git rm installer.sh - - git add installer.sh - git commit -m "Remove installer.sh" - git checkout dev-release git merge -X theirs master-ci