Skip to content

Commit

Permalink
prepared repo to merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
juandpenan committed Nov 6, 2024
1 parent 254e4ba commit d90c7ce
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ ADD https://raw.githubusercontent.com/jmguerreroh/yolov8_ros/refs/heads/main/req
ADD https://raw.githubusercontent.com/mgonzs13/tts_ros/refs/heads/main/requirements.txt /robocup/requirements5.txt

# Install external dependencies.
# RUN pip install -r requirements1.txt --break-system-packages
# RUN pip install -r requirements2.txt --break-system-packages
# RUN pip install -r requirements3.txt --break-system-packages
# RUN pip install -r requirements4.txt --break-system-packages
# RUN pip install -r requirements5.txt --break-system-packages
RUN pip install -r requirements1.txt --break-system-packages
RUN pip install -r requirements2.txt --break-system-packages
RUN pip install -r requirements3.txt --break-system-packages
RUN pip install -r requirements4.txt --break-system-packages
RUN pip install -r requirements5.txt --break-system-packages


WORKDIR /robocup/src
RUN git clone https://github.com/juandpenan/CoreSense4Home.git -b rolling
RUN git clone https://github.com/CoreSenseEU/CoreSense4Home.git -b jazzy
RUN vcs import --recursive < ./CoreSense4Home/robocup_bringup/thirdparty.repos

WORKDIR /robocup
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: rolling
name: jazzy

on:
pull_request:
branches:
- rolling
- jazzy
push:
branches:
- rolling
- jazzy
schedule:
- cron: '0 0 * * 6'
jobs:
Expand Down
12 changes: 6 additions & 6 deletions robocup_bringup/thirdparty.repos
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ repositories:
version: jazzy
systems/perception_system:
type: git
url: https://github.com/juandpenan/perception_system.git
version: rolling
url: https://github.com/jmguerreroh/perception_system.git
version: jazzy
systems/attention_system:
type: git
url: https://github.com/juandpenan/attention_system.git
version: rolling
url: https://github.com/aaggj/attention_system.git
version: jazzy
systems/navigation_system:
type: git
url: https://github.com/Juancams/navigation_system.git
version: main
ThirdParty/gpsr_planning:
type: git
url: https://github.com/juandpenan/GPSR_planning.git
version: rolling
url: https://github.com/igonzf/GPSR_planning.git
version: main



Expand Down

0 comments on commit d90c7ce

Please sign in to comment.