From 73021a2016d72165b3386a0e38223b60aeed82d5 Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Fri, 8 Sep 2023 15:01:38 +0900 Subject: [PATCH 1/4] 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 0000000000..b8f6a51a15 --- /dev/null +++ b/.github/workflows/beta-to-tier4-main-sync.yaml @@ -0,0 +1,34 @@ +name: sync-tier4-upstream + +on: + workflow_dispatch: + inputs: + source_branch: + description: Source branch + required: true + type: string + +jobs: + sync-tier4-upstream: + 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_launch.git + sync-target-branch: ${{ inputs.target_branch }} + pr-title: "chore: sync beta branch ${{ inputs.target_branch }} with tier4/main" + pr-labels: | + bot + sync-tier4-upstream + auto-merge-method: merge From ddbf6c4c56611fa598ea6ebd3b9e13b14d014a16 Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Fri, 8 Sep 2023 15:06:00 +0900 Subject: [PATCH 2/4] fix: fix workflow name Signed-off-by: tomoya.kimura --- .github/workflows/beta-to-tier4-main-sync.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beta-to-tier4-main-sync.yaml b/.github/workflows/beta-to-tier4-main-sync.yaml index b8f6a51a15..cf694263d3 100644 --- a/.github/workflows/beta-to-tier4-main-sync.yaml +++ b/.github/workflows/beta-to-tier4-main-sync.yaml @@ -1,4 +1,4 @@ -name: sync-tier4-upstream +name: beta-to-tier4-main-sync on: workflow_dispatch: From 2aa916fed21fbf573d6543248cdc44579611b063 Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Fri, 8 Sep 2023 15:13:58 +0900 Subject: [PATCH 3/4] fix: fix job name and pr-label 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 cf694263d3..f05da9e572 100644 --- a/.github/workflows/beta-to-tier4-main-sync.yaml +++ b/.github/workflows/beta-to-tier4-main-sync.yaml @@ -9,7 +9,7 @@ on: type: string jobs: - sync-tier4-upstream: + sync-beta-branch: runs-on: ubuntu-latest steps: - name: Generate token @@ -30,5 +30,5 @@ jobs: pr-title: "chore: sync beta branch ${{ inputs.target_branch }} with tier4/main" pr-labels: | bot - sync-tier4-upstream + sync-beta-branch auto-merge-method: merge From bff7a0157eb23432c99c20743b4a7e887e15356e Mon Sep 17 00:00:00 2001 From: "tomoya.kimura" Date: Fri, 8 Sep 2023 15:49:00 +0900 Subject: [PATCH 4/4] 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 f05da9e572..79bdb6f0bd 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_launch.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