diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index 2afd706e66a..27c5ca95d10 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -25,12 +25,18 @@ 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 + - name: Set Docker tags id: set-docker-tags run: | diff --git a/.github/workflows/build-main-self-hosted.yaml b/.github/workflows/build-main-self-hosted.yaml index d83234253f6..eebd079e7e3 100644 --- a/.github/workflows/build-main-self-hosted.yaml +++ b/.github/workflows/build-main-self-hosted.yaml @@ -44,12 +44,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: @@ -58,12 +52,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 953f93492b1..e21552915b1 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -39,12 +39,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: @@ -53,12 +47,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 f5066a2c9ca..05c05033efb 100644 --- a/.github/workflows/docker-build-and-push-main-self-hosted.yaml +++ b/.github/workflows/docker-build-and-push-main-self-hosted.yaml @@ -56,12 +56,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: @@ -70,11 +64,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 430b6dbe031..4323f2568f2 100644 --- a/.github/workflows/docker-build-and-push-main.yaml +++ b/.github/workflows/docker-build-and-push-main.yaml @@ -51,12 +51,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: @@ -65,11 +59,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: