Skip to content

Commit

Permalink
refactor docker-build-and-push
Browse files Browse the repository at this point in the history
Signed-off-by: Yutaka Kondo <[email protected]>
  • Loading branch information
youtalk committed Jun 10, 2024
1 parent 2202a94 commit e01c1ca
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 48 deletions.
10 changes: 8 additions & 2 deletions .github/actions/docker-build-and-push/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
13 changes: 1 addition & 12 deletions .github/workflows/build-main-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
13 changes: 1 addition & 12 deletions .github/workflows/build-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/docker-build-and-push-main-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/docker-build-and-push-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit e01c1ca

Please sign in to comment.