From a154e68e678c428db14f6c7ae30f0805ca35af39 Mon Sep 17 00:00:00 2001 From: Takayuki Murooka Date: Thu, 29 Feb 2024 23:17:17 +0900 Subject: [PATCH 1/2] chore: remove unnecessary workflows Signed-off-by: Takayuki Murooka --- .github/workflows/create-awf-latest.yml | 25 ----------------- .github/workflows/sync-awf-latest-s1.yaml | 31 ---------------------- .github/workflows/sync-awf-latest-x1.yaml | 31 ---------------------- .github/workflows/sync-awf-latest-x2.yaml | 31 ---------------------- .github/workflows/sync-awf-latest-xx1.yaml | 31 ---------------------- .github/workflows/sync-tier4-upstream.yaml | 31 ---------------------- 6 files changed, 180 deletions(-) delete mode 100644 .github/workflows/create-awf-latest.yml delete mode 100644 .github/workflows/sync-awf-latest-s1.yaml delete mode 100644 .github/workflows/sync-awf-latest-x1.yaml delete mode 100644 .github/workflows/sync-awf-latest-x2.yaml delete mode 100644 .github/workflows/sync-awf-latest-xx1.yaml delete mode 100644 .github/workflows/sync-tier4-upstream.yaml diff --git a/.github/workflows/create-awf-latest.yml b/.github/workflows/create-awf-latest.yml deleted file mode 100644 index d68a6c3cb..000000000 --- a/.github/workflows/create-awf-latest.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: create-awf-latest - -on: - schedule: - - cron: 0 0 * * * - workflow_dispatch: - -jobs: - create-awf-latest: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Commit Results - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - - git checkout awf-latest - git remote add awf https://github.com/autowarefoundation/autoware_launch - git fetch awf main - git rebase awf/main - - git push origin awf-latest --force diff --git a/.github/workflows/sync-awf-latest-s1.yaml b/.github/workflows/sync-awf-latest-s1.yaml deleted file mode 100644 index c14d001c6..000000000 --- a/.github/workflows/sync-awf-latest-s1.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: sync-awf-latest-s1 - -on: - schedule: - - cron: 0 0 * * * - workflow_dispatch: - -jobs: - sync-awf-latest-s1: - 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: awf-latest-s1 - sync-pr-branch: sync-awf-latest-s1 - sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git - sync-target-branch: main - pr-title: "chore: sync awf-latest-s1" - pr-labels: | - bot - sync-awf-latest-s1 - auto-merge-method: merge diff --git a/.github/workflows/sync-awf-latest-x1.yaml b/.github/workflows/sync-awf-latest-x1.yaml deleted file mode 100644 index c348e6d85..000000000 --- a/.github/workflows/sync-awf-latest-x1.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: sync-awf-latest-x1 - -on: - schedule: - - cron: 0 0 * * * - workflow_dispatch: - -jobs: - sync-awf-latest-x1: - 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: awf-latest-x1 - sync-pr-branch: sync-awf-latest-x1 - sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git - sync-target-branch: main - pr-title: "chore: sync awf-latest-x1" - pr-labels: | - bot - sync-awf-latest-x1 - auto-merge-method: merge diff --git a/.github/workflows/sync-awf-latest-x2.yaml b/.github/workflows/sync-awf-latest-x2.yaml deleted file mode 100644 index 97ed22a5f..000000000 --- a/.github/workflows/sync-awf-latest-x2.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: sync-awf-latest-x2 - -on: - schedule: - - cron: 0 0 * * * - workflow_dispatch: - -jobs: - sync-awf-latest-x2: - 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: awf-latest-x2 - sync-pr-branch: sync-awf-latest-x2 - sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git - sync-target-branch: main - pr-title: "chore: sync awf-latest-x2" - pr-labels: | - bot - sync-awf-latest-x2 - auto-merge-method: merge diff --git a/.github/workflows/sync-awf-latest-xx1.yaml b/.github/workflows/sync-awf-latest-xx1.yaml deleted file mode 100644 index 6b6432b55..000000000 --- a/.github/workflows/sync-awf-latest-xx1.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: sync-awf-latest-xx1 - -on: - schedule: - - cron: 0 0 * * * - workflow_dispatch: - -jobs: - sync-awf-latest-xx1: - 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: awf-latest-xx1 - sync-pr-branch: sync-awf-latest-xx1 - sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git - sync-target-branch: main - pr-title: "chore: sync awf-latest-xx1" - pr-labels: | - bot - sync-awf-latest-xx1 - auto-merge-method: merge diff --git a/.github/workflows/sync-tier4-upstream.yaml b/.github/workflows/sync-tier4-upstream.yaml deleted file mode 100644 index b7dc824f8..000000000 --- a/.github/workflows/sync-tier4-upstream.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: sync-tier4-upstream - -on: - schedule: - - cron: 0 0 * * * - workflow_dispatch: - -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: sync-tier4-upstream - sync-target-repository: https://github.com/tier4/autoware_launch.git - sync-target-branch: tier4/main - pr-title: "chore: sync upstream" - pr-labels: | - bot - sync-tier4-upstream - auto-merge-method: merge From 6088c2a9db6b90593b9965d91170a18e8a9ae23e Mon Sep 17 00:00:00 2001 From: Takayuki Murooka Date: Thu, 29 Feb 2024 23:29:10 +0900 Subject: [PATCH 2/2] fix Signed-off-by: Takayuki Murooka --- .github/workflows/sync-tier4-upstream.yaml | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/sync-tier4-upstream.yaml diff --git a/.github/workflows/sync-tier4-upstream.yaml b/.github/workflows/sync-tier4-upstream.yaml new file mode 100644 index 000000000..b97a9bab2 --- /dev/null +++ b/.github/workflows/sync-tier4-upstream.yaml @@ -0,0 +1,32 @@ +# This workflow is intended for the use in the repositories created by forking tier4/autoware_launch. +name: sync-tier4-upstream + +on: + schedule: + - cron: 0 0 * * * + workflow_dispatch: + +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: sync-tier4-upstream + sync-target-repository: https://github.com/tier4/autoware_launch.git + sync-target-branch: tier4/main + pr-title: "chore: sync upstream" + pr-labels: | + bot + sync-tier4-upstream + auto-merge-method: merge