From d6b429ef74f77b9daeaf02ebfab9db8a6ad2dc9c Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Fri, 8 Sep 2023 15:14:46 +0900 Subject: [PATCH 1/2] chore: add workflow to merge beta branch to tier4 main Signed-off-by: tomoya.kimura --- .../workflows/beta-to-tier4-main-sync.yaml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/beta-to-tier4-main-sync.yaml diff --git a/.github/workflows/beta-to-tier4-main-sync.yaml b/.github/workflows/beta-to-tier4-main-sync.yaml new file mode 100644 index 0000000000000..21a5eee4787e2 --- /dev/null +++ b/.github/workflows/beta-to-tier4-main-sync.yaml @@ -0,0 +1,34 @@ +name: beta-to-tier4-main-sync + +on: + workflow_dispatch: + inputs: + source_branch: + description: Source branch + required: true + type: string + +jobs: + sync-beta-branch: + runs-on: ubuntu-latest + steps: + - name: Generate token + id: generate-token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.APP_ID }} + private_key: ${{ secrets.PRIVATE_KEY }} + + - name: Run sync-branches + uses: autowarefoundation/autoware-github-actions/sync-branches@v1 + with: + token: ${{ steps.generate-token.outputs.token }} + base-branch: tier4/main + sync-pr-branch: beta-to-tier4-main-sync + sync-target-repository: https://github.com/tier4/autoware.universe.git + sync-target-branch: ${{ inputs.target_branch }} + pr-title: "chore: sync beta branch ${{ inputs.target_branch }} with tier4/main" + pr-labels: | + bot + sync-beta-branch + auto-merge-method: merge From e18b910169fb544b43814223635f08f913c21613 Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Fri, 8 Sep 2023 15:50:24 +0900 Subject: [PATCH 2/2] fix: fix variable name Signed-off-by: tomoya.kimura --- .github/workflows/beta-to-tier4-main-sync.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beta-to-tier4-main-sync.yaml b/.github/workflows/beta-to-tier4-main-sync.yaml index 21a5eee4787e2..53f40f1e811ab 100644 --- a/.github/workflows/beta-to-tier4-main-sync.yaml +++ b/.github/workflows/beta-to-tier4-main-sync.yaml @@ -26,8 +26,8 @@ jobs: base-branch: tier4/main sync-pr-branch: beta-to-tier4-main-sync sync-target-repository: https://github.com/tier4/autoware.universe.git - sync-target-branch: ${{ inputs.target_branch }} - pr-title: "chore: sync beta branch ${{ inputs.target_branch }} with tier4/main" + sync-target-branch: ${{ inputs.source_branch }} + pr-title: "chore: sync beta branch ${{ inputs.source_branch }} with tier4/main" pr-labels: | bot sync-beta-branch