From 72e907405b82700aec68712f641d68d129d18685 Mon Sep 17 00:00:00 2001 From: Justin Merrell Date: Tue, 24 Jan 2023 02:03:34 -0500 Subject: [PATCH] Update CD_dev-release.yml --- .github/workflows/CD_dev-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 86656a8..dbca892 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -80,10 +80,9 @@ jobs: git config user.email github-actions@github.com git checkout dev-release - git pull origin dev-release - git merge master-ci + git merge origin/master-ci rm -rf LICENSE rm -rf README.md @@ -93,7 +92,8 @@ jobs: git add . - git diff-index --quiet HEAD || git commit -m "Sanitize dev-release" + git diff-index --quiet HEAD || git commit -m "Merge master-ci into dev-release and remove unnecessary files" + git push origin dev-release - name: Webhook