Skip to content

Commit

Permalink
Merge branch 'main' into gnss-poser-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
mitsudome-r authored Jan 22, 2025
2 parents 110151f + fdc7c2d commit 446f950
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ env:
CXX: /usr/lib/ccache/g++

jobs:
make-sure-label-is-present:
uses: autowarefoundation/autoware-github-actions/.github/workflows/make-sure-label-is-present.yaml@v1
require-label:
uses: autowarefoundation/autoware-github-actions/.github/workflows/require-label.yaml@v1
with:
label: tag:run-build-and-test-differential
label: run:build-and-test-differential

build-and-test-differential:
needs: make-sure-label-is-present
if: ${{ needs.make-sure-label-is-present.outputs.result == 'true' }}
needs: require-label
if: ${{ needs.require-label.outputs.result == 'true' }}
runs-on: ubuntu-24.04
container: ghcr.io/autowarefoundation/autoware:core-devel
steps:
Expand Down
80 changes: 80 additions & 0 deletions .github/workflows/bump-version-pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: bump-version-pr

on:
workflow_dispatch:
inputs:
version_part:
description: Which part of the version number to bump?
required: true
default: minor
type: choice
options:
- major
- minor
- patch

jobs:
bump-version-pr:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v4
with:
ref: humble
fetch-depth: 0

- name: Generate token
id: generate-token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}

- name: Set git config
uses: autowarefoundation/autoware-github-actions/set-git-config@v1
with:
token: ${{ steps.generate-token.outputs.token }}

- name: Setup Python 3.x
uses: actions/setup-python@v5
with:
python-version: 3.x

- name: Install dependencies
run: pip3 install -U catkin_tools
shell: bash

- name: Bump version from humble branch
id: bump-version-from-humble-branch
run: |
git checkout -b tmp/bot/bump_version_base
git fetch origin main
git merge origin/main
catkin_generate_changelog -y
git add *
git commit -m "update CHANGELOG.rst"
catkin_prepare_release -y --bump ${{ inputs.version_part }} --no-push
version=$(git describe --tags)
echo "version=${version}" >> $GITHUB_OUTPUT
shell: bash

- name: Create target branch
run: |
git checkout origin/main
git checkout -b chore/bot/bump_version
git merge tmp/bot/bump_version_base
git push origin chore/bot/bump_version --force
shell: bash

- name: Create PR
id: create-pr
run: >
gh
pr
create
--base=main
--body="Bump version to ${{ steps.bump-version-from-humble-branch.outputs.version }}"
--title="chore: bump version to ${{ steps.bump-version-from-humble-branch.outputs.version }}"
--head=chore/bot/bump_version
env:
GH_TOKEN: ${{ steps.generate-token.outputs.token }}

0 comments on commit 446f950

Please sign in to comment.