yhl452493373/spt-server-ci
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

update .yaml

Browse Source
This commit is contained in:
AirryCo
2024-11-21 13:38:05 +08:00
parent 88cd3a050c
commit 1801cdcf35
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build-release-cron.yaml vendored
View File

@@ -125,8 +125,8 @@ jobs:
run: | run: |
cd ${{ env.SOURCECODE_DIR }} cd ${{ env.SOURCECODE_DIR }}
git pull git pull
git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ needs.prepare.outputs.TARGET_TAG }}:SPT-${{ needs.prepare.outputs.TARGET_TAG }} git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ RELEASE_BRANCH }}:SPT-${{ RELEASE_BRANCH }}
git merge -m "🤖 Merge tag \`${{ needs.prepare.outputs.TARGET_TAG }}\` from SPT" --no-ff SPT-${{ needs.prepare.outputs.TARGET_TAG }} git merge -m "🤖 Merge tag \`${{ needs.prepare.outputs.TARGET_TAG }}\` from SPT" --no-ff ${{ needs.prepare.outputs.TARGET_TAG }}
shell: bash shell: bash
- name: Runner Debug Information - name: Runner Debug Information
@@ -239,8 +239,8 @@ jobs:
run: | run: |
cd ${{ env.SOURCECODE_DIR }} cd ${{ env.SOURCECODE_DIR }}
git pull git pull
git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ needs.prepare.outputs.TARGET_TAG }}:SPT-${{ needs.prepare.outputs.TARGET_TAG }} git fetch -u ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git ${{ RELEASE_BRANCH }}:SPT-${{ RELEASE_BRANCH }}
git merge -m "🤖 Merge tag \`${{ needs.prepare.outputs.TARGET_TAG }}\` from SPT" --no-ff SPT-${{ needs.prepare.outputs.TARGET_TAG }} git merge -m "🤖 Merge tag \`${{ needs.prepare.outputs.TARGET_TAG }}\` from SPT" --no-ff ${{ needs.prepare.outputs.TARGET_TAG }}
shell: bash shell: bash
- name: Runner Debug Information - name: Runner Debug Information
@@ -397,6 +397,7 @@ jobs:
git push git push
git tag -d ${{ needs.prepare.outputs.TARGET_TAG }} git tag -d ${{ needs.prepare.outputs.TARGET_TAG }}
git tag ${{ needs.prepare.outputs.TARGET_TAG }} git tag ${{ needs.prepare.outputs.TARGET_TAG }}
git push -u origin ${{ RELEASE_BRANCH }}
git push -u origin ${{ needs.prepare.outputs.TARGET_TAG }} git push -u origin ${{ needs.prepare.outputs.TARGET_TAG }}
shell: bash shell: bash