From e4140e3a2ba95dfb25ee4571527507eef487463f Mon Sep 17 00:00:00 2001 From: Kenji Miyake Date: Wed, 30 Nov 2022 22:26:42 +0900 Subject: [PATCH 1/2] ci: remove Galactic CI workflows Signed-off-by: Kenji Miyake --- .github/sync-files.yaml | 6 --- ...ild-and-test-differential-self-hosted.yaml | 4 -- .../build-and-test-differential.yaml | 4 -- .../workflows/build-and-test-self-hosted.yaml | 4 -- .github/workflows/build-and-test.yaml | 4 -- .github/workflows/check-build-depends.yaml | 4 -- build_depends.humble.repos | 43 ------------------- build_depends.repos | 2 +- 8 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 build_depends.humble.repos diff --git a/.github/sync-files.yaml b/.github/sync-files.yaml index 0af942aee420f..17d0bd6382c44 100644 --- a/.github/sync-files.yaml +++ b/.github/sync-files.yaml @@ -34,7 +34,6 @@ - source: .github/workflows/build-and-test.yaml pre-commands: | sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source} - sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source} sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source} sd -- \ @@ -46,7 +45,6 @@ - source: .github/workflows/build-and-test-differential.yaml pre-commands: | sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source} - sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source} sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source} sd -- \ @@ -60,7 +58,6 @@ - source: .github/workflows/build-and-test-differential-self-hosted.yaml pre-commands: | sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source} - sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source} sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source} sd -- \ @@ -71,7 +68,6 @@ - source: .github/workflows/build-and-test-self-hosted.yaml pre-commands: | sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source} - sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source} sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source} sd -- \ @@ -81,8 +77,6 @@ - -cuda include:" {source} - source: .github/workflows/check-build-depends.yaml - pre-commands: | - sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source} - source: .github/workflows/clang-tidy-pr-comments.yaml - source: .github/workflows/clang-tidy-pr-comments-manually.yaml - source: .github/workflows/update-codeowners-from-packages.yaml diff --git a/.github/workflows/build-and-test-differential-self-hosted.yaml b/.github/workflows/build-and-test-differential-self-hosted.yaml index 67fce235ada55..85a6c361b9741 100644 --- a/.github/workflows/build-and-test-differential-self-hosted.yaml +++ b/.github/workflows/build-and-test-differential-self-hosted.yaml @@ -23,14 +23,10 @@ jobs: fail-fast: false matrix: rosdistro: - - galactic - humble container-suffix: - -cuda include: - - rosdistro: galactic - container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest - build-depends-repos: build_depends.repos - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest build-depends-repos: build_depends.humble.repos diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml index 43bb8f7bbfea6..b09d369029542 100644 --- a/.github/workflows/build-and-test-differential.yaml +++ b/.github/workflows/build-and-test-differential.yaml @@ -11,14 +11,10 @@ jobs: fail-fast: false matrix: rosdistro: - - galactic - humble container-suffix: - -cuda include: - - rosdistro: galactic - container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest - build-depends-repos: build_depends.repos - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest build-depends-repos: build_depends.humble.repos diff --git a/.github/workflows/build-and-test-self-hosted.yaml b/.github/workflows/build-and-test-self-hosted.yaml index fd1ba6a50cd1f..eac80b8badd42 100644 --- a/.github/workflows/build-and-test-self-hosted.yaml +++ b/.github/workflows/build-and-test-self-hosted.yaml @@ -13,15 +13,11 @@ jobs: fail-fast: false matrix: rosdistro: - - galactic - humble container-suffix: - "" - -cuda include: - - rosdistro: galactic - container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest - build-depends-repos: build_depends.repos - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest build-depends-repos: build_depends.humble.repos diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index c12b2a7ed34b5..ef100821aba0b 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -15,15 +15,11 @@ jobs: fail-fast: false matrix: rosdistro: - - galactic - humble container-suffix: - "" - -cuda include: - - rosdistro: galactic - container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest - build-depends-repos: build_depends.repos - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest build-depends-repos: build_depends.humble.repos diff --git a/.github/workflows/check-build-depends.yaml b/.github/workflows/check-build-depends.yaml index 600eaa3c5dcb4..fc312dba47c93 100644 --- a/.github/workflows/check-build-depends.yaml +++ b/.github/workflows/check-build-depends.yaml @@ -13,12 +13,8 @@ jobs: fail-fast: false matrix: rosdistro: - - galactic - humble include: - - rosdistro: galactic - container: ros:galactic - build-depends-repos: build_depends.repos - rosdistro: humble container: ros:humble build-depends-repos: build_depends.humble.repos diff --git a/build_depends.humble.repos b/build_depends.humble.repos deleted file mode 100644 index 5e8ce5953172a..0000000000000 --- a/build_depends.humble.repos +++ /dev/null @@ -1,43 +0,0 @@ -repositories: - # core - core/autoware_common: - type: git - url: https://github.com/autowarefoundation/autoware_common.git - version: main - core/autoware.core: - type: git - url: https://github.com/autowarefoundation/autoware.core.git - version: main - core/autoware_msgs: - type: git - url: https://github.com/autowarefoundation/autoware_msgs.git - version: main - core/autoware_adapi_msgs: - type: git - url: https://github.com/autowarefoundation/autoware_adapi_msgs.git - version: main - core/external/autoware_auto_msgs: - type: git - url: https://github.com/tier4/autoware_auto_msgs.git - version: tier4/main - # universe - universe/external/tier4_autoware_msgs: - type: git - url: https://github.com/tier4/tier4_autoware_msgs.git - version: tier4/universe - universe/external/grid_map: - type: git - url: https://github.com/ANYbotics/grid_map.git - version: 74333f037cfce321248dfa7b954a815d4f67d79d - universe/external/mussp: - type: git - url: https://github.com/tier4/muSSP.git - version: tier4/main - universe/external/ndt_omp: - type: git - url: https://github.com/tier4/ndt_omp.git - version: tier4/main - universe/external/morai_msgs: - type: git - url: https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs.git - version: main diff --git a/build_depends.repos b/build_depends.repos index 2b47af3ef8e81..5e8ce5953172a 100644 --- a/build_depends.repos +++ b/build_depends.repos @@ -28,7 +28,7 @@ repositories: universe/external/grid_map: type: git url: https://github.com/ANYbotics/grid_map.git - version: ba2f9cb6e62f7ee9c5bac7401391a211e442e459 + version: 74333f037cfce321248dfa7b954a815d4f67d79d universe/external/mussp: type: git url: https://github.com/tier4/muSSP.git From f8653750a3d75bf7af04d03fb1013909ffef60f6 Mon Sep 17 00:00:00 2001 From: Kenji Miyake Date: Thu, 1 Dec 2022 22:52:40 +0900 Subject: [PATCH 2/2] fix repos name Signed-off-by: Kenji Miyake --- .../workflows/build-and-test-differential-self-hosted.yaml | 2 +- .github/workflows/build-and-test-differential.yaml | 4 ++-- .github/workflows/build-and-test-self-hosted.yaml | 2 +- .github/workflows/build-and-test.yaml | 2 +- .github/workflows/check-build-depends.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test-differential-self-hosted.yaml b/.github/workflows/build-and-test-differential-self-hosted.yaml index 85a6c361b9741..9a527e97a7b46 100644 --- a/.github/workflows/build-and-test-differential-self-hosted.yaml +++ b/.github/workflows/build-and-test-differential-self-hosted.yaml @@ -29,7 +29,7 @@ jobs: include: - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest - build-depends-repos: build_depends.humble.repos + build-depends-repos: build_depends.repos steps: - name: Check out repository uses: actions/checkout@v3 diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml index b09d369029542..60eda66c57df5 100644 --- a/.github/workflows/build-and-test-differential.yaml +++ b/.github/workflows/build-and-test-differential.yaml @@ -17,7 +17,7 @@ jobs: include: - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest - build-depends-repos: build_depends.humble.repos + build-depends-repos: build_depends.repos steps: - name: Check out repository uses: actions/checkout@v3 @@ -90,4 +90,4 @@ jobs: target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }} target-files: ${{ steps.get-modified-files.outputs.all_changed_files }} clang-tidy-config-url: https://raw.githubusercontent.com/autowarefoundation/autoware/main/.clang-tidy - build-depends-repos: build_depends.humble.repos + build-depends-repos: build_depends.repos diff --git a/.github/workflows/build-and-test-self-hosted.yaml b/.github/workflows/build-and-test-self-hosted.yaml index eac80b8badd42..9f351a5dc75ec 100644 --- a/.github/workflows/build-and-test-self-hosted.yaml +++ b/.github/workflows/build-and-test-self-hosted.yaml @@ -20,7 +20,7 @@ jobs: include: - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest - build-depends-repos: build_depends.humble.repos + build-depends-repos: build_depends.repos steps: - name: Check out repository uses: actions/checkout@v3 diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index ef100821aba0b..383eb2def936c 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -22,7 +22,7 @@ jobs: include: - rosdistro: humble container: ghcr.io/autowarefoundation/autoware-universe:humble-latest - build-depends-repos: build_depends.humble.repos + build-depends-repos: build_depends.repos steps: - name: Check out repository uses: actions/checkout@v3 diff --git a/.github/workflows/check-build-depends.yaml b/.github/workflows/check-build-depends.yaml index fc312dba47c93..81618a1db0eea 100644 --- a/.github/workflows/check-build-depends.yaml +++ b/.github/workflows/check-build-depends.yaml @@ -17,7 +17,7 @@ jobs: include: - rosdistro: humble container: ros:humble - build-depends-repos: build_depends.humble.repos + build-depends-repos: build_depends.repos steps: - name: Check out repository uses: actions/checkout@v3