From 3e1813fa6237bb7e3029199e52c3be72c1305749 Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Mon, 28 Feb 2022 18:37:47 +0900 Subject: [PATCH] ci: add sync-files.yaml (#28) * ci: add sync-files.yaml Signed-off-by: Kenji Miyake * update config Signed-off-by: Kenji Miyake --- .github/get_modified_package.sh | 76 ------------- .github/sync-files.yaml | 21 ++++ .github/workflows/build_and_test.yml | 68 ----------- .github/workflows/build_and_test_pr.yml | 69 ------------ .github/workflows/spell_check_pr.yml | 21 ---- .github/workflows/sync-files.yaml | 22 ++++ .github/workflows/sync-main-for-develop.yml | 66 ----------- .github/workflows/sync-public-develop.yaml | 40 ------- .github/workflows/sync-public.yaml | 40 ------- .github/workflows/sync-rc.yml | 119 -------------------- .github/workflows/update-pre-commit.yml | 42 ------- .pre-commit-config.yaml | 68 ++++++----- build_depends.repos | 4 +- 13 files changed, 77 insertions(+), 579 deletions(-) delete mode 100755 .github/get_modified_package.sh create mode 100644 .github/sync-files.yaml delete mode 100644 .github/workflows/build_and_test.yml delete mode 100644 .github/workflows/build_and_test_pr.yml delete mode 100644 .github/workflows/spell_check_pr.yml create mode 100644 .github/workflows/sync-files.yaml delete mode 100644 .github/workflows/sync-main-for-develop.yml delete mode 100644 .github/workflows/sync-public-develop.yaml delete mode 100644 .github/workflows/sync-public.yaml delete mode 100644 .github/workflows/sync-rc.yml delete mode 100644 .github/workflows/update-pre-commit.yml diff --git a/.github/get_modified_package.sh b/.github/get_modified_package.sh deleted file mode 100755 index cc99e534..00000000 --- a/.github/get_modified_package.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# Search for packages that have been modified from the main branch. -# Usage: get_modified_package.sh - -set -e - -SCRIPT_DIR=$(readlink -f "$(dirname "$0")") -ROOT_DIR=$(readlink -f "$SCRIPT_DIR"/../) - -# Parse arguments -args=() -while [ "${1:-}" != "" ]; do - case "$1" in - *) - args+=("$1") - ;; - esac - shift -done - -base_branch="${args[0]}" - -# Check args -if [ "$base_branch" = "" ]; then - echo -e "\e[31mPlease input a valid base_branch as the 1st argument.\e[m" - exit 1 -fi - -function find_package_dir() { - [ "$1" == "" ] && return 1 - - target_dir=$(dirname "$1") - while true ; do - parent_dir=$(dirname "$target_dir") - - # Exit if no parent found - if [ "$parent_dir" = "$target_dir" ] ; then - return 0 - fi - - # Output package name if package.xml found - if [ -f "$target_dir/package.xml" ] ; then - if [ ! -f "$target_dir/COLCON_IGNORE" ] ; then - echo "$target_dir" - return 0 - fi - fi - - # Move to parent dir - target_dir=$parent_dir - done - - return 1 -} - -# Find modified files from base branch -modified_files=$(git diff --name-only "$base_branch"...HEAD) - -# Find modified packages -modified_package_dirs=() -for modified_file in $modified_files; do - modified_package_dir=$(find_package_dir "$ROOT_DIR/$modified_file") - - if [ "$modified_package_dir" != "" ] ; then - modified_package_dirs+=("$modified_package_dir") - fi -done - -# Get package names from paths -if [ "${#modified_package_dirs[@]}" != "0" ] ; then - modified_packages=$(colcon list --names-only --paths "${modified_package_dirs[@]}") -fi - -# Output -# shellcheck disable=SC2086 -echo ::set-output name=package_list::$modified_packages diff --git a/.github/sync-files.yaml b/.github/sync-files.yaml new file mode 100644 index 00000000..30122a85 --- /dev/null +++ b/.github/sync-files.yaml @@ -0,0 +1,21 @@ +- repository: autowarefoundation/autoware + files: + - source: .github/dependabot.yaml + - source: .github/workflows/pre-commit.yaml + - source: .github/workflows/pre-commit-optional.yaml + - source: .github/workflows/semantic-pull-request.yaml + - source: .github/workflows/spell-check-differential.yaml + - source: .clang-format + - source: .markdown-link-check.json + - source: .markdownlint.yaml + - source: .pre-commit-config-optional.yaml + - source: .prettierignore + - source: .prettierrc.yaml + - source: .yamllint.yaml + - source: CPPLINT.cfg + - source: setup.cfg + +- repository: autowarefoundation/autoware_common + files: + - source: .github/workflows/build-and-test.yaml + - source: .github/workflows/build-and-test-differential.yaml diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml deleted file mode 100644 index 16e04763..00000000 --- a/.github/workflows/build_and_test.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Build and test - -on: - schedule: - - cron: "0 19 * * *" # run at 4 AM JST - workflow_dispatch: - -jobs: - build-and-test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - branch: - - main - - develop - container: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - ref: ${{ matrix.branch }} - - - name: Install pip - run: | - apt-get -y update - apt-get -y install python3-pip - - - name: Search packages in this repository - id: list_packages - run: | - echo ::set-output name=package_list::$(colcon list --names-only) - - - name: Show target packages - run: | - echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" - - - name: Remove exec_depend to avoid unnecessary build - run: | - find . -name package.xml | xargs -I {} sed -i -rz "s|\s*[a-zA-Z_0-9]+\s*\n||g" {} - - - name: Set git config for private repositories - run: | - git config --local --unset-all http.https://github.com/.extraheader || true - git config --global url.https://${{ secrets.REPO_TOKEN }}@github.com.insteadOf 'https://github.com' - - - name: Clone dependency packages - run: | - mkdir dependency_ws - vcs import dependency_ws < build_depends.repos - apt-get -y update - rosdep update - DEBIAN_FRONTEND=noninteractive rosdep install -y --from-paths . --ignore-src --rosdistro galactic - - - name: Build - run: | - . /opt/ros/galactic/setup.sh - colcon build --event-handlers console_cohesion+ \ - --packages-up-to ${{ steps.list_packages.outputs.package_list }} \ - --cmake-args -DCMAKE_BUILD_TYPE=Release - - - name: Run tests - run: | - . /opt/ros/galactic/setup.sh - colcon test --event-handlers console_cohesion+ \ - --packages-select ${{ steps.list_packages.outputs.package_list }} \ - --return-code-on-test-failure diff --git a/.github/workflows/build_and_test_pr.yml b/.github/workflows/build_and_test_pr.yml deleted file mode 100644 index 144bff16..00000000 --- a/.github/workflows/build_and_test_pr.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Build and test for PR - -on: - pull_request: - -jobs: - build-and-test-pr: - runs-on: ubuntu-latest - container: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest - - steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 - - - name: Checkout repository - uses: actions/checkout@v2 - with: - # Fetch with depth=0 to calculate modified packages - fetch-depth: 0 - - - name: Install pip - run: | - apt-get -y update - apt-get -y install python3-pip - - - name: Search modified packages - id: list_packages - run: | - ${GITHUB_WORKSPACE}/.github/get_modified_package.sh origin/${{ github.base_ref }} - - - name: Show target packages - run: | - echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" - - - name: Remove exec_depend to avoid unnecessary build - if: ${{ steps.list_packages.outputs.package_list != '' }} - run: | - find . -name package.xml | xargs -I {} sed -i -rz "s|\s*[a-zA-Z_0-9]+\s*\n||g" {} - - - name: Set git config for private repositories - if: ${{ steps.list_packages.outputs.package_list != '' }} - run: | - git config --local --unset-all http.https://github.com/.extraheader || true - git config --global url.https://${{ secrets.REPO_TOKEN }}@github.com.insteadOf 'https://github.com' - - - name: Clone dependency packages - if: ${{ steps.list_packages.outputs.package_list != '' }} - run: | - mkdir dependency_ws - vcs import dependency_ws < build_depends.repos - apt-get -y update - rosdep update - DEBIAN_FRONTEND=noninteractive rosdep install -y --from-paths . --ignore-src --rosdistro galactic - - - name: Build - if: ${{ steps.list_packages.outputs.package_list != '' }} - run: | - . /opt/ros/galactic/setup.sh - colcon build --event-handlers console_cohesion+ \ - --packages-up-to ${{ steps.list_packages.outputs.package_list }} \ - --cmake-args -DCMAKE_BUILD_TYPE=Release - - - name: Run tests - if: ${{ steps.list_packages.outputs.package_list != '' }} - run: | - . /opt/ros/galactic/setup.sh - colcon test --event-handlers console_cohesion+ \ - --packages-select ${{ steps.list_packages.outputs.package_list }} \ - --return-code-on-test-failure diff --git a/.github/workflows/spell_check_pr.yml b/.github/workflows/spell_check_pr.yml deleted file mode 100644 index 5b37a85b..00000000 --- a/.github/workflows/spell_check_pr.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Check spelling - -on: - pull_request: - -jobs: - spellcheck: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Retrieve spell check dictionary - run: | - curl --silent --show-error \ - --output .github/workflows/.cspell.json \ - https://raw.githubusercontent.com/tier4/autoware-spell-check-dict/main/cspell/.cspell.json - - - uses: streetsidesoftware/cspell-action@v1 - with: - config: ".github/workflows/.cspell.json" diff --git a/.github/workflows/sync-files.yaml b/.github/workflows/sync-files.yaml new file mode 100644 index 00000000..0c5b4b04 --- /dev/null +++ b/.github/workflows/sync-files.yaml @@ -0,0 +1,22 @@ +name: sync-files + +on: + schedule: + - cron: 0 19 * * * # run at 4 AM JST + workflow_dispatch: + +jobs: + sync-files: + 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-files + uses: autowarefoundation/autoware-github-actions/sync-files@tier4/proposal + with: + token: ${{ steps.generate-token.outputs.token }} diff --git a/.github/workflows/sync-main-for-develop.yml b/.github/workflows/sync-main-for-develop.yml deleted file mode 100644 index ea329bf8..00000000 --- a/.github/workflows/sync-main-for-develop.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: sync main for develop - -on: - schedule: - - cron: "0 19 * * *" # run at 4 AM JST - workflow_dispatch: - -env: - BASE_BRANCH: develop - SYNC_TARGET_BRANCH: main - SYNC_BRANCH: sync-main-for-develop - -jobs: - sync-main-for-develop: - runs-on: ubuntu-20.04 - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - ref: ${{ env.BASE_BRANCH }} - fetch-depth: 0 - - - name: Generate token - uses: tibdex/github-app-token@v1 - id: generate-token - with: - app_id: ${{ secrets.APP_ID }} - private_key: ${{ secrets.APP_PRIVATE_KEY }} - - # To keep the base branch in "create-pull-request", checkout with "BASE_BRANCH" and reset to "SYNC_TARGET_BRANCH" - - name: Reset to sync target branch - run: | - git reset --hard origin/${{ env.SYNC_TARGET_BRANCH }} - - - name: Create PR - id: create_pr - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ steps.generate-token.outputs.token }} - commit-message: sync main for develop - committer: GitHub - author: GitHub - signoff: false - base: ${{ env.BASE_BRANCH }} - branch: ${{ env.SYNC_BRANCH }} - delete-branch: true - title: sync main for develop - body: | - sync main for develop - labels: | - sync-main-for-develop - draft: false - - - name: Check outputs - run: | - echo "Pull Request Number - ${{ steps.create_pr.outputs.pull-request-number }}" - echo "Pull Request URL - ${{ steps.create_pr.outputs.pull-request-url }}" - - - name: Enable Auto-merge - if: steps.create_pr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v1 - with: - token: ${{ steps.generate-token.outputs.token }} - pull-request-number: ${{ steps.create_pr.outputs.pull-request-number }} - merge-method: merge diff --git a/.github/workflows/sync-public-develop.yaml b/.github/workflows/sync-public-develop.yaml deleted file mode 100644 index 464317a5..00000000 --- a/.github/workflows/sync-public-develop.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: sync public - -on: - schedule: - - cron: "0 19 * * *" # run at 4 AM JST - workflow_dispatch: - -env: - BASE_BRANCH: develop - SYNC_TARGET_BRANCH: develop - SYNC_TARGET_REPOSITORY: https://github.com/tier4/AutowareArchitectureProposal_aip_launcher.git - -jobs: - sync-public: - runs-on: ubuntu-20.04 - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - ref: ${{ env.BASE_BRANCH }} - fetch-depth: 0 - - - name: Generate token - uses: tibdex/github-app-token@v1 - id: generate-token - with: - app_id: ${{ secrets.PROPOSAL_SYNC_APP_ID }} - private_key: ${{ secrets.PROPOSAL_SYNC_APP_PRIVATE_KEY }} - - - name: Set git config for private repositories - run: | - git config --local --unset-all http.https://github.com/.extraheader || true - git config --global url.https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com.insteadOf 'https://github.com' - - - name: Push to public repository - run: | - git remote add public ${{ env.SYNC_TARGET_REPOSITORY }} - git fetch public - git push public ${{ env.BASE_BRANCH }}:${{ env.SYNC_TARGET_BRANCH }} diff --git a/.github/workflows/sync-public.yaml b/.github/workflows/sync-public.yaml deleted file mode 100644 index 4553696d..00000000 --- a/.github/workflows/sync-public.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: sync public - -on: - schedule: - - cron: "0 19 * * *" # run at 4 AM JST - workflow_dispatch: - -env: - BASE_BRANCH: main - SYNC_TARGET_BRANCH: main - SYNC_TARGET_REPOSITORY: https://github.com/tier4/AutowareArchitectureProposal_aip_launcher.git - -jobs: - sync-public: - runs-on: ubuntu-20.04 - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - ref: ${{ env.BASE_BRANCH }} - fetch-depth: 0 - - - name: Generate token - uses: tibdex/github-app-token@v1 - id: generate-token - with: - app_id: ${{ secrets.PROPOSAL_SYNC_APP_ID }} - private_key: ${{ secrets.PROPOSAL_SYNC_APP_PRIVATE_KEY }} - - - name: Set git config for private repositories - run: | - git config --local --unset-all http.https://github.com/.extraheader || true - git config --global url.https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com.insteadOf 'https://github.com' - - - name: Push to public repository - run: | - git remote add public ${{ env.SYNC_TARGET_REPOSITORY }} - git fetch public - git push public ${{ env.BASE_BRANCH }}:${{ env.SYNC_TARGET_BRANCH }} diff --git a/.github/workflows/sync-rc.yml b/.github/workflows/sync-rc.yml deleted file mode 100644 index a4549672..00000000 --- a/.github/workflows/sync-rc.yml +++ /dev/null @@ -1,119 +0,0 @@ -name: sync rc - -on: - pull_request: - branches: - - "rc/*" - types: - - closed - workflow_dispatch: - inputs: - rc_branch: - description: "Target RC branch(e.g. rc/v1.0.0)" - required: true - -jobs: - sync-rc: - runs-on: ubuntu-20.04 - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Generate token - uses: tibdex/github-app-token@v1 - id: generate-token - with: - app_id: ${{ secrets.APP_ID }} - private_key: ${{ secrets.APP_PRIVATE_KEY }} - - - name: Set SYNC_TARGET_BRANCH for pull_request event - if: github.event_name == 'pull_request' - run: | - echo "SYNC_TARGET_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV - - - name: Set SYNC_TARGET_BRANCH for workflow_dispatch event - if: github.event_name == 'workflow_dispatch' - run: | - echo "SYNC_TARGET_BRANCH=${{ github.event.inputs.rc_branch }}" >> $GITHUB_ENV - - - name: Set SYNC_BRANCH - run: | - echo ${SYNC_TARGET_BRANCH} | grep -e "^rc/v.*" - echo "SYNC_BRANCH=sync-rc/${SYNC_TARGET_BRANCH#refs/heads/}" >> $GITHUB_ENV - - - name: Judge BASE_BRANCH - run: | - function is_main_base() { - target_branch="$1" - - main_base=$(git merge-base "${target_branch}" origin/main) - develop_base=$(git merge-base "${target_branch}" origin/develop) - - return $(test "${main_base}" = "${develop_base}") - } - - if is_main_base "origin/${{ env.SYNC_TARGET_BRANCH }}"; then - base_branch=main - else - base_branch=develop - fi - - echo "BASE_BRANCH=${base_branch}" >> $GITHUB_ENV - - - name: Checkout repository - uses: actions/checkout@v2 - with: - ref: ${{ env.BASE_BRANCH }} - fetch-depth: 0 - - # To keep the base branch in "create-pull-request", checkout with "BASE_BRANCH" and reset to "SYNC_TARGET_BRANCH" - - name: Reset to sync target branch - run: | - git reset --hard origin/${{ env.SYNC_TARGET_BRANCH }} - - - name: Set git config - run: | - git config --local user.email "actions@example.com" - git config --local user.name "Github Actions" - - - name: Rebase on the base branch - run: | - for commit in $(git rev-list --left-only "origin/${{ env.BASE_BRANCH }}"...HEAD | tac); do - merge_base=$(git merge-base HEAD "origin/${{ env.BASE_BRANCH }}") - git rebase --onto "$commit" "$merge_base" "${{ env.BASE_BRANCH }}" || git rebase --abort - done - - - name: Create PR - id: create_pr - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ steps.generate-token.outputs.token }} - commit-message: sync rc - committer: GitHub - author: GitHub - signoff: false - base: ${{ env.BASE_BRANCH }} - branch: ${{ env.SYNC_BRANCH }} - delete-branch: true - title: sync rc ${{ env.SYNC_TARGET_BRANCH }} - body: | - sync rc ${{ env.SYNC_TARGET_BRANCH }} - labels: | - sync-rc - draft: false - - - name: Check outputs - run: | - echo "Pull Request Number - ${{ steps.create_pr.outputs.pull-request-number }}" - echo "Pull Request URL - ${{ steps.create_pr.outputs.pull-request-url }}" - - - name: Enable Auto-merge - if: steps.create_pr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v1 - with: - token: ${{ steps.generate-token.outputs.token }} - pull-request-number: ${{ steps.create_pr.outputs.pull-request-number }} - merge-method: squash diff --git a/.github/workflows/update-pre-commit.yml b/.github/workflows/update-pre-commit.yml deleted file mode 100644 index d4a2f277..00000000 --- a/.github/workflows/update-pre-commit.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Update pre-commit - -on: - schedule: - - cron: "0 19 * * 0" # run at 4 AM JST on Sundays - workflow_dispatch: - -jobs: - update-pre-commit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Generate token - uses: tibdex/github-app-token@v1 - id: generate-token - with: - app_id: ${{ secrets.APP_ID }} - private_key: ${{ secrets.APP_PRIVATE_KEY }} - - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - - name: Install pre-commit - run: pip install pre-commit - - - name: Run pre-commit autoupdate - run: pre-commit autoupdate - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ steps.generate-token.outputs.token }} - base: main - branch: update/pre-commit-autoupdate - title: Auto-update pre-commit hooks - commit-message: Auto-update pre-commit hooks - body: | - Update versions of tools in pre-commit configs to latest version - labels: dependencies diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 59d935c1..6d388b72 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,25 +1,10 @@ -# To install: -# -# pip install pre-commit -# -# To use: -# -# pre-commit run -a -# -# Or: -# -# pre-commit install # (runs every time you commit in git) -# -# To update this file: -# -# pre-commit autoupdate -# -# See https://github.com/pre-commit/pre-commit +ci: + autofix_commit_msg: "ci(pre-commit): autofix" + autoupdate_commit_msg: "ci(pre-commit): autoupdate" repos: - # Standard hooks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.1.0 hooks: - id: check-json - id: check-merge-conflict @@ -33,37 +18,48 @@ repos: args: [--markdown-linebreak-ext=md] - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.29.0 + rev: v0.30.0 hooks: - id: markdownlint - args: ["-c", ".markdownlint.yaml", "--fix"] + args: [-c, .markdownlint.yaml, --fix] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.4.1 + rev: v2.5.1 hooks: - id: prettier + - repo: https://github.com/adrienverge/yamllint + rev: v1.26.3 + hooks: + - id: yamllint + - repo: https://github.com/tier4/pre-commit-hooks-ros rev: v0.4.0 hooks: - id: prettier-package-xml - id: sort-package-xml - - repo: https://github.com/gruntwork-io/pre-commit - rev: v0.1.17 + - repo: https://github.com/shellcheck-py/shellcheck-py + rev: v0.8.0.1 hooks: - id: shellcheck + - repo: https://github.com/scop/pre-commit-shfmt + rev: v3.4.1-1 + hooks: + - id: shfmt + args: [-w, -s, -i=4] + - repo: https://github.com/pycqa/isort - rev: 5.9.3 + rev: 5.10.1 hooks: - id: isort - repo: https://github.com/psf/black - rev: 21.9b0 + rev: 22.1.0 hooks: - id: black - args: ["--line-length=100"] + args: [--line-length=100] - repo: https://github.com/PyCQA/flake8 rev: 4.0.1 @@ -71,14 +67,14 @@ repos: - id: flake8 additional_dependencies: [ - "flake8-blind-except", - "flake8-builtins", - "flake8-class-newline", - "flake8-comprehensions", - "flake8-deprecated", - "flake8-docstrings", - "flake8-import-order", - "flake8-quotes", + flake8-blind-except, + flake8-builtins, + flake8-class-newline, + flake8-comprehensions, + flake8-deprecated, + flake8-docstrings, + flake8-import-order, + flake8-quotes, ] -exclude: ".svg" +exclude: .svg diff --git a/build_depends.repos b/build_depends.repos index 5e650722..ec3feccc 100644 --- a/build_depends.repos +++ b/build_depends.repos @@ -1,5 +1,5 @@ repositories: - tier4_ament_lint: + autoware_common: type: git - url: https://github.com/tier4/tier4_ament_lint.git + url: https://github.com/autowarefoundation/autoware_common.git version: main