Skip to content

Commit b422fde

Browse files
committed
adapt to trixie
1 parent 715b898 commit b422fde

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ concurrency:
1212

1313
env:
1414
DISTRIBUTION: debian
15-
DEB_DISTRO: sid
16-
BRANCH: sid-one-unstable
15+
DEB_DISTRO: trixie
16+
BRANCH: trixie-one-unstable
1717
JOBS_YAML: /home/runner/jobs.yaml
1818
AGG: /home/runner/apt_repo_dependencies
1919

.github/workflows/worker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
required: true
99

1010
env:
11-
DEB_DISTRO: sid
11+
DEB_DISTRO: trixie
1212
JOBS_YAML: /home/runner/jobs.yaml
1313

1414
jobs:

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22

33
- See the [main branch](https://github.com/v4hn/ros-o-builder/tree/main) for more information.
44

5-
- See the [built package branch](https://github.com/v4hn/ros-o-builder/tree/sid-one-unstable) for install information and build details.
5+
- See the [built package branch](https://github.com/v4hn/ros-o-builder/tree/trixie-one) for install information and build details.
6+
7+
- See the [unstable package branch](https://github.com/v4hn/ros-o-builder/tree/trixie-one-unstable) for install information and build details.

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# debian sid docker with (some) preinstalled ros-one packages
1+
# debian trixie docker with (some) preinstalled ros-one packages
22
FROM debian:sid
33

44
RUN apt update
@@ -7,10 +7,10 @@ RUN apt install -y vim less ca-certificates sudo bash-completion python3-pip git
77
RUN apt install -y python3-bloom
88
RUN pip3 install catkin-tools
99

10-
RUN echo "deb [trusted=yes] https://raw.githubusercontent.com/v4hn/ros-o-builder/sid-one-unstable/repository ./" | sudo tee /etc/apt/sources.list.d/v4hn_ros-o-builder.list
10+
RUN echo "deb [trusted=yes] https://raw.githubusercontent.com/v4hn/ros-o-builder/trixie-one-unstable/repository ./" | sudo tee /etc/apt/sources.list.d/v4hn_ros-o-builder.list
1111
RUN sudo apt update
1212
RUN sudo apt install -y python3-rosdep2
13-
RUN echo "yaml https://raw.githubusercontent.com/v4hn/ros-o-builder/sid-one-unstable/repository/local.yaml debian" | sudo tee /etc/ros/rosdep/sources.list.d/1-v4hn_ros-o-builder.list
13+
RUN echo "yaml https://raw.githubusercontent.com/v4hn/ros-o-builder/trixie-one-unstable/repository/local.yaml debian" | sudo tee /etc/ros/rosdep/sources.list.d/1-v4hn_ros-o-builder.list
1414
RUN rosdep update
1515

1616
RUN apt install -y ros-one-desktop-full

docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/bash
22

3-
docker build -t sid-ros-one --no-cache "$@" .
3+
docker build -t trixie-ros-one --no-cache "$@" .

docker/run_latest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
55
PDIR="$(dirname "$DIR")"
66

7-
exec docker run -it --mount type=bind,source=$PDIR,destination=/ros-o-builder sid-ros-one:latest bash -l
7+
exec docker run -it --mount type=bind,source=$PDIR,destination=/ros-o-builder trixie-ros-one:latest bash -l

scripts/build-yaml-generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
3636
env:
3737
DISTRIBUTION: ubuntu
38-
DEB_DISTRO: sid
39-
BRANCH: sid-one-experimental
38+
DEB_DISTRO: trixie
39+
BRANCH: trixie-one-experimental
4040
JOBS_YAML: /home/runner/jobs.yaml
4141
AGG: /home/runner/apt_repo_dependencies
4242

0 commit comments

Comments
 (0)