File tree Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Original file line number Diff line number Diff line change 33
33
new_version : ${{ steps.new_version.outputs.new_version }}
34
34
steps :
35
35
- name : Restore branch
36
+ if : github.event.pull_request.merged == true
36
37
uses : levonet/action-restore-branch@master
37
38
38
39
- name : Install bloom
42
43
uses : actions/checkout@v4
43
44
with :
44
45
ref : master
46
+ repository : ${{ github.event.pull_request.base.repo.full_name }}
45
47
fetch-depth : 0
46
48
fetch-tags : true
47
49
@@ -50,16 +52,19 @@ jobs:
50
52
git config --global user.name "Release Bot"
51
53
git config --global user.email "[email protected] "
52
54
git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2
53
- git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }}
54
55
git config pull.rebase false
55
56
57
+ - name : Setup git credential
58
+ if : github.event.pull_request.merged == true
59
+ run : git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }}
60
+
56
61
- name : Get old version
57
62
id : old_version
58
63
run : |
59
64
echo "old_version=$(catkin_package_version)" >> $GITHUB_OUTPUT
60
65
61
- - name : Merge branch
62
- run : git pull origin ${{ github.head_ref }}
66
+ - name : Pull head branch
67
+ run : git pull ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.head_ref }}
63
68
64
69
- name : Bump patch version
65
70
if : (contains(github.event.pull_request.labels.*.name, 'bump patch'))
You can’t perform that action at this time.
0 commit comments