Skip to content

Commit 48b0fe4

Browse files
committed
fix(backend): 修正action3
# Reviewed, transaction id: 66264
1 parent 3f68527 commit 48b0fe4

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.github/workflows/auto_create_release.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,26 @@ jobs:
8787
cat ${filename}
8888
git config --global user.email 826035498@qq.com
8989
git config --global user.name zhangzhw8
90-
# 测试后改回 TencentBlueKing
91-
git remote add upstream https://$WORKFLOW_ACTION_TOKEN@github.com/iSecloud/blueking-dbm
90+
git remote set-url origin https://$WORKFLOW_ACTION_TOKEN@github.com/iSecloud/blueking-dbm.git
9291
git remote -v
9392
git status
9493
git add ${filename}
9594
git commit -m "chore: release version ${{ steps.yaml-data.outputs.data }} #1"
9695
# 创建新分支用于提交 PR
97-
release_branch="release/add-release-file"
96+
release_branch="release/add-release-file-${{ steps.yaml-data.outputs.data }}"
9897
git checkout -b ${release_branch}
99-
git push --set-upstream upstream ${release_branch}
98+
git push --set-upstream origin ${release_branch}
10099
echo "release_branch=${release_branch}" >> $GITHUB_OUTPUT
101100
102101
- id: create-release-file-pr
103102
name: Create Pull Request for Release File
104-
uses: peter-evans/create-pull-request@v3
103+
uses: peter-evans/create-pull-request@v6
104+
env:
105+
GITHUB_TOKEN: ${{ secrets.WORKFLOW_ACTION_TOKEN }}
105106
with:
106-
token: "${{ secrets.WORKFLOW_ACTION_TOKEN }}"
107+
token: ${{ secrets.WORKFLOW_ACTION_TOKEN }}
107108
title: 'chore: release version ${{ steps.yaml-data.outputs.data }} #1'
108109
body: 'Auto-generated PR to add release file for version ${{ steps.yaml-data.outputs.data }}'
109-
branch: '${{ steps.add-release-file.outputs.release_branch }}'
110-
base: '${{ steps.get-current-branch.outputs.current_branch }}'
110+
branch: ${{ steps.add-release-file.outputs.release_branch }}
111+
base: ${{ steps.get-current-branch.outputs.current_branch }}
112+
delete-branch: true

helm-charts/bk-dbm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,5 @@ dependencies:
103103
description: A Helm chart for bk-dbm
104104
name: bk-dbm
105105
type: application
106-
version: 1.5.0-alpha.76
107-
appVersion: 1.5.0-alpha.76
106+
version: 1.5.0-alpha.77
107+
appVersion: 1.5.0-alpha.77

0 commit comments

Comments
 (0)