From dd0bd90daae18571f33695ce578a4ded089a2061 Mon Sep 17 00:00:00 2001 From: "tier4-autoware-private-bot[bot]" <87871706+tier4-autoware-private-bot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 03:08:45 +0000 Subject: [PATCH] chore: sync files (#452) * chore: sync files Signed-off-by: GitHub * Update sync-files.yaml Co-authored-by: kenji-miyake Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> --- .github/sync-files.yaml | 5 +---- .github/workflows/sync-files.yaml | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/sync-files.yaml b/.github/sync-files.yaml index 6a4686a664434..2a702633d4598 100644 --- a/.github/sync-files.yaml +++ b/.github/sync-files.yaml @@ -7,6 +7,7 @@ - source: .github/workflows/pre-commit-optional.yaml - source: .github/workflows/semantic-pull-request.yaml - source: .github/workflows/spell-check-differential.yaml + - source: .github/workflows/sync-files.yaml # - source: .github/workflows/vcs-import.yaml # TODO: Sync after renaming to autoware.repos - source: .clang-format - source: .markdown-link-check.json @@ -19,7 +20,3 @@ - source: .yamllint.yaml - source: CPPLINT.cfg - source: setup.cfg - -- repository: autowarefoundation/autoware_common - files: - - source: .github/workflows/sync-files.yaml diff --git a/.github/workflows/sync-files.yaml b/.github/workflows/sync-files.yaml index 32f4613f6de7a..5dfe195c06537 100644 --- a/.github/workflows/sync-files.yaml +++ b/.github/workflows/sync-files.yaml @@ -20,3 +20,4 @@ jobs: uses: autowarefoundation/autoware-github-actions/sync-files@v1 with: token: ${{ steps.generate-token.outputs.token }} + auto-merge-method: squash