From dfe3cb261c6fbf8e2a8727221c4c09b783ffe903 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Mon, 10 Jun 2024 22:48:26 +0900
Subject: [PATCH] refactor(ci): install `vcstool` and run `vcs import` on
 `docker-build-and-push.yaml` (#4845)

* refactor docker-build-and-push

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>

* fix shell

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>

---------

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Co-authored-by: oguzkaganozt <oguzkaganozt@gmail.com>
---
 .github/actions/docker-build-and-push/action.yaml   | 11 +++++++++--
 .github/workflows/build-main-self-hosted.yaml       | 13 +------------
 .github/workflows/build-main.yaml                   | 13 +------------
 .../docker-build-and-push-main-self-hosted.yaml     | 11 -----------
 .github/workflows/docker-build-and-push-main.yaml   | 11 -----------
 5 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
index 2afd706e66..91f82916a9 100644
--- a/.github/actions/docker-build-and-push/action.yaml
+++ b/.github/actions/docker-build-and-push/action.yaml
@@ -25,10 +25,17 @@ runs:
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v2
 
-    - name: Install jq
+    - name: Install jq and vcstool
       run: |
         sudo apt-get -y update
-        sudo apt-get -y install jq
+        sudo apt-get -y install jq python3-pip
+        pip install --no-cache-dir vcstool
+      shell: bash
+
+    - name: Run vcs import
+      run: |
+        mkdir src
+        vcs import src < autoware.repos
       shell: bash
 
     - name: Set Docker tags
diff --git a/.github/workflows/build-main-self-hosted.yaml b/.github/workflows/build-main-self-hosted.yaml
index 1bbb7b5147..07e07e67a5 100644
--- a/.github/workflows/build-main-self-hosted.yaml
+++ b/.github/workflows/build-main-self-hosted.yaml
@@ -46,12 +46,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - name: Install vcstool
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install python3-pip
-          pip install --no-cache-dir vcstool
-
       - name: Set git config
         uses: autowarefoundation/autoware-github-actions/set-git-config@v1
         with:
@@ -60,12 +54,7 @@ jobs:
       - name: Free disk space
         uses: ./.github/actions/free-disk-space
 
-      - name: Run vcs import
-        run: |
-          mkdir src
-          vcs import src < autoware.repos
-
-      - name: Build 'autoware-universe'
+      - name: Build 'Autoware'
         uses: ./.github/actions/docker-build-and-push
         with:
           bake-target: autoware
diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml
index bb261df918..86380deb51 100644
--- a/.github/workflows/build-main.yaml
+++ b/.github/workflows/build-main.yaml
@@ -41,12 +41,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - name: Install vcstool
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install python3-pip
-          pip install --no-cache-dir vcstool
-
       - name: Set git config
         uses: autowarefoundation/autoware-github-actions/set-git-config@v1
         with:
@@ -55,12 +49,7 @@ jobs:
       - name: Free disk space
         uses: ./.github/actions/free-disk-space
 
-      - name: Run vcs import
-        run: |
-          mkdir src
-          vcs import src < autoware.repos
-
-      - name: Build 'autoware-universe'
+      - name: Build 'Autoware'
         uses: ./.github/actions/docker-build-and-push
         with:
           bake-target: autoware
diff --git a/.github/workflows/docker-build-and-push-main-self-hosted.yaml b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
index d7df16222b..e91d46bb64 100644
--- a/.github/workflows/docker-build-and-push-main-self-hosted.yaml
+++ b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
@@ -58,12 +58,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - name: Install vcstool
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install python3-pip
-          pip install --no-cache-dir vcstool
-
       - name: Set git config
         uses: autowarefoundation/autoware-github-actions/set-git-config@v1
         with:
@@ -72,11 +66,6 @@ jobs:
       - name: Free disk space
         uses: ./.github/actions/free-disk-space
 
-      - name: Run vcs import
-        run: |
-          mkdir src
-          vcs import src < autoware.repos
-
       - name: Build 'Autoware'
         uses: ./.github/actions/docker-build-and-push
         with:
diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml
index e0f04aaf55..fee5967c7d 100644
--- a/.github/workflows/docker-build-and-push-main.yaml
+++ b/.github/workflows/docker-build-and-push-main.yaml
@@ -53,12 +53,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - name: Install vcstool
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install python3-pip
-          pip install --no-cache-dir vcstool
-
       - name: Set git config
         uses: autowarefoundation/autoware-github-actions/set-git-config@v1
         with:
@@ -67,11 +61,6 @@ jobs:
       - name: Free disk space
         uses: ./.github/actions/free-disk-space
 
-      - name: Run vcs import
-        run: |
-          mkdir src
-          vcs import src < autoware.repos
-
       - name: Build 'Autoware'
         uses: ./.github/actions/docker-build-and-push
         with: