Skip to content

Commit 3e30feb

Browse files
committed
update github actions, scripts and readmes (with few exceptions: search for .repos and vcs)
Signed-off-by: Taeseung Sohn <taeseung.sohn@tier4.jp>
1 parent ae4948e commit 3e30feb

10 files changed

Lines changed: 35 additions & 52 deletions

File tree

.github/actions/docker-build-and-push-cuda/action.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ inputs:
1919
runs:
2020
using: composite
2121
steps:
22-
- name: Install jq and vcs2l
22+
- name: Install jq
2323
run: |
2424
sudo apt-get -y update
2525
sudo apt-get -y install curl gnupg lsb-release
@@ -30,13 +30,12 @@ runs:
3030
sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
3131
3232
sudo apt-get update
33-
sudo apt-get install -y jq python3-pip python3-vcs2l
33+
sudo apt-get install -y jq
3434
shell: bash
3535

36-
- name: Run vcs import
36+
- name: Initialize submodules
3737
run: |
38-
mkdir -p src
39-
vcs import --shallow src < repositories/autoware.repos
38+
git submodule update --init --checkout src/autoware
4039
shell: bash
4140

4241
- name: Setup Docker Buildx

.github/actions/docker-build-and-push-tools/action.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,15 @@ inputs:
1919
runs:
2020
using: composite
2121
steps:
22-
- name: Install jq and vcs2l
22+
- name: Install jq
2323
run: |
2424
sudo apt-get -y update
25-
sudo apt-get -y install jq python3-pip
26-
pip install --no-cache-dir vcs2l
25+
sudo apt-get -y install jq
2726
shell: bash
2827

29-
- name: Run vcs import
28+
- name: Initialize submodules
3029
run: |
31-
mkdir -p src
32-
vcs import --shallow src < repositories/simulator.repos
30+
git submodule update --init --checkout src/simulator
3331
shell: bash
3432

3533
- name: Setup Docker Buildx

.github/actions/docker-build-and-push/action.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,15 @@ inputs:
3232
runs:
3333
using: composite
3434
steps:
35-
- name: Install jq and vcs2l
35+
- name: Install jq
3636
run: |
3737
sudo apt-get -y update
38-
sudo apt-get -y install jq python3-pip
39-
pip install --no-cache-dir vcs2l
38+
sudo apt-get -y install jq
4039
shell: bash
4140

42-
- name: Run vcs import
41+
- name: Initialize submodules
4342
run: |
44-
mkdir -p src
45-
vcs import --shallow src < repositories/autoware.repos
43+
git submodule update --init --checkout src/autoware
4644
shell: bash
4745

4846
- name: Setup Docker Buildx

.github/actions/docker-build/action.yaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ inputs:
88
cache-tag-suffix:
99
description: Suffix of the target cache tag.
1010
required: true
11-
additional-repos:
12-
description: Additional target .repos file.
13-
default: ""
11+
use-nightly:
12+
description: Whether to use nightly submodules.
13+
default: false
1414
required: false
1515
build-args:
1616
description: Additional build args.
@@ -22,23 +22,15 @@ runs:
2222
- name: Setup Docker Buildx
2323
uses: docker/setup-buildx-action@v3
2424

25-
- name: Install vcs2l
25+
- name: Initialize submodules
2626
run: |
27-
sudo apt-get -y update
28-
sudo apt-get -y install python3-pip
29-
pipx install vcs2l
27+
git submodule update --init --checkout src/autoware
3028
shell: bash
3129

32-
- name: Run vcs import
30+
- name: Initialize submodules to nightly
31+
if: ${{ inputs.use-nightly }}
3332
run: |
34-
mkdir -p src
35-
vcs import --shallow src < repositories/autoware.repos
36-
shell: bash
37-
38-
- name: Import additional repositories
39-
if: ${{ inputs.additional-repos != '' }}
40-
run: |
41-
vcs import --shallow --force src < ${{ inputs.additional-repos }}
33+
git submodule update --remote src/autoware
4234
shell: bash
4335

4436
- name: Cache ccache

.github/workflows/docker-build-and-push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ jobs:
5353
with:
5454
files: |
5555
*.env
56-
*.repos
5756
.github/actions/combine-multi-arch-images/action.yaml
5857
.github/actions/docker-build-and-push*/action.yaml
5958
.github/workflows/docker-build-and-push.yaml
6059
ansible-galaxy-requirements.yaml
6160
ansible/**
6261
docker/**
62+
src/**
6363
6464
- name: Free disk space
6565
if: ${{ steps.changed-files.outputs.any_changed == 'true' ||
@@ -120,13 +120,13 @@ jobs:
120120
with:
121121
files: |
122122
*.env
123-
*.repos
124123
.github/actions/combine-multi-arch-images/action.yaml
125124
.github/actions/docker-build-and-push*/action.yaml
126125
.github/workflows/docker-build-and-push.yaml
127126
ansible-galaxy-requirements.yaml
128127
ansible/**
129128
docker/**
129+
src/**
130130
131131
- name: Free disk space
132132
if: ${{ steps.changed-files.outputs.any_changed == 'true' ||
@@ -190,13 +190,13 @@ jobs:
190190
with:
191191
files: |
192192
*.env
193-
*.repos
194193
.github/actions/combine-multi-arch-images/action.yaml
195194
.github/actions/docker-build-and-push*/action.yaml
196195
.github/workflows/docker-build-and-push.yaml
197196
ansible-galaxy-requirements.yaml
198197
ansible/**
199198
docker/**
199+
src/**
200200
201201
- name: Free disk space
202202
if: ${{ runner.environment == 'github-hosted' &&
@@ -301,13 +301,13 @@ jobs:
301301
with:
302302
files: |
303303
*.env
304-
*.repos
305304
.github/actions/combine-multi-arch-images/action.yaml
306305
.github/actions/docker-build-and-push*/action.yaml
307306
.github/workflows/docker-build-and-push.yaml
308307
ansible-galaxy-requirements.yaml
309308
ansible/**
310309
docker/**
310+
src/**
311311
312312
- name: Free disk space
313313
if: ${{ steps.changed-files.outputs.any_changed == 'true' ||

.github/workflows/health-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ jobs:
6464
with:
6565
files: |
6666
*.env
67-
*.repos
6867
.github/actions/docker-build/action.yaml
6968
.github/workflows/health-check.yaml
7069
ansible-galaxy-requirements.yaml
7170
ansible/**
7271
docker/**
72+
src/**
7373
setup-dev-env.sh
7474
7575
- name: Show disk space
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
platform: ${{ matrix.platform }}
9292
cache-tag-suffix: ${{ matrix.build-type }}
93-
additional-repos: ${{ matrix.build-type == 'nightly' && 'repositories/autoware-nightly.repos' || '' }}
93+
use-nightly: ${{ matrix.build-type == 'nightly' }}
9494
build-args: |
9595
ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
9696
AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}

.github/workflows/scenario-test.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@ jobs:
3030
lsb-release \
3131
python3-pip \
3232
git
33-
pip install --upgrade gdown vcs2l
33+
pip install --upgrade gdown
3434
- name: Show memory info
3535
shell: bash
3636
run: free -h
37-
- name: Clone Autoware and Import simulator.repos
37+
- name: Clone Autoware and Initialize Simulator
3838
shell: bash
3939
run: |
4040
git clone https://github.com/autowarefoundation/autoware.git ~/autoware_ws
4141
cd ~/autoware_ws
42-
mkdir -p src
43-
vcs import src < repositories/simulator.repos
42+
git submodule update --init --checkout src/simulator
4443
- name: Install ROS dependencies
4544
shell: bash
4645
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ To learn more about using or developing Autoware, refer to the [Autoware documen
6363
## Repository overview
6464

6565
- [autowarefoundation/autoware](https://github.com/autowarefoundation/autoware)
66-
- Meta-repository containing `.repos` files to construct an Autoware workspace.
66+
- Meta-repository containing Autoware components as git submodules.
6767
- It is anticipated that this repository will be frequently forked by users, and so it contains minimal information to avoid unnecessary differences.
6868
- [autowarefoundation/autoware_core](https://github.com/autowarefoundation/autoware_core)
6969
- Main repository for high-quality, stable ROS packages for Autonomous Driving.

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If you do not need the CUDA drivers, you can also use the smaller image `ghcr.io
1212
```shell
1313
$ git clone git@github.com:autowarefoundation/autoware.git
1414
$ cd autoware
15-
$ vcs import src < repositories/autoware.repos
15+
$ git submodule update --init --checkout src/autoware
1616
$ docker run -it --rm \
1717
–v $PWD/src/universe/autoware_universe/XXX/autoware_YYY:/autoware/src/autoware_YYY \
1818
ghcr.io/autowarefoundation/autoware:universe-devel-cuda

docker/build.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,11 @@ load_env() {
131131
# Clone repositories
132132
clone_repositories() {
133133
cd "$WORKSPACE_ROOT"
134-
if [ ! -d "src" ]; then
135-
mkdir -p src
136-
vcs import src <repositories/autoware.repos
137-
else
138-
echo "Source directory already exists. Updating repositories..."
139-
vcs import src <repositories/autoware.repos
140-
vcs pull src
134+
if [ -d "src" ]; then
135+
rm -rf src
141136
fi
137+
git submodule update --init --checkout src/autoware
138+
git submodule update --init --checkout src/extra-packages
142139
}
143140

144141
# Build images

0 commit comments

Comments
 (0)