Skip to content

Fix errors in Release.yaml with external pull-request #1608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hakuturu583 merged 3 commits into from
May 23, 2025
+8 −3
Merged

Fix errors in Release.yaml with external pull-request #1608

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a545346
Restore branch only when pull-request is closed in Release.yaml
HansRobo May 23, 2025
9cf4c30
Setup git credencial only when pull-request is merged in Release.yaml
HansRobo May 23, 2025
7be81df
Use appropriate repository in Release.yaml
HansRobo May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/Release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
new_version: ${{ steps.new_version.outputs.new_version }}
steps:
- name: Restore branch
if: github.event.pull_request.merged == true
uses: levonet/action-restore-branch@master

- name: Install bloom
Expand All @@ -42,6 +43,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: master
repository: ${{ github.event.pull_request.base.repo.full_name }}
fetch-depth: 0
fetch-tags: true

Expand All @@ -50,16 +52,19 @@ jobs:
git config --global user.name "Release Bot"
git config --global user.email "action@github.com"
git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2
git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }}
git config pull.rebase false

- name: Setup git credential
if: github.event.pull_request.merged == true
run: git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }}

- name: Get old version
id: old_version
run: |
echo "old_version=$(catkin_package_version)" >> $GITHUB_OUTPUT

- name: Merge branch
run: git pull origin ${{ github.head_ref }}
- name: Pull head branch
run: git pull ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.head_ref }}

- name: Bump patch version
if: (contains(github.event.pull_request.labels.*.name, 'bump patch'))
Expand Down