From feb56b6f4a9e412c785ce061e20764134f784c8d Mon Sep 17 00:00:00 2001 From: AirryCo Date: Thu, 21 Nov 2024 13:42:33 +0800 Subject: [PATCH] fixed .yaml --- .github/workflows/build-release-cron.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-release-cron.yaml b/.github/workflows/build-release-cron.yaml index 195512b..81caa6d 100644 --- a/.github/workflows/build-release-cron.yaml +++ b/.github/workflows/build-release-cron.yaml @@ -125,7 +125,7 @@ jobs: run: | cd ${{ env.SOURCECODE_DIR }} git pull - git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ RELEASE_BRANCH }}:SPT-${{ RELEASE_BRANCH }} + git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ env.RELEASE_BRANCH }}:SPT-${{ env.RELEASE_BRANCH }} git merge -m "🤖 Merge tag \`${{ needs.prepare.outputs.TARGET_TAG }}\` from SPT" --no-ff ${{ needs.prepare.outputs.TARGET_TAG }} shell: bash @@ -239,7 +239,7 @@ jobs: run: | cd ${{ env.SOURCECODE_DIR }} git pull - git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ RELEASE_BRANCH }}:SPT-${{ RELEASE_BRANCH }} + git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ env.RELEASE_BRANCH }}:SPT-${{ env.RELEASE_BRANCH }} git merge -m "🤖 Merge tag \`${{ needs.prepare.outputs.TARGET_TAG }}\` from SPT" --no-ff ${{ needs.prepare.outputs.TARGET_TAG }} shell: bash @@ -397,7 +397,7 @@ jobs: git push git tag -d ${{ needs.prepare.outputs.TARGET_TAG }} git tag ${{ needs.prepare.outputs.TARGET_TAG }} - git push -u origin ${{ RELEASE_BRANCH }} + git push -u origin ${{ env.RELEASE_BRANCH }} git push -u origin ${{ needs.prepare.outputs.TARGET_TAG }} shell: bash