Skip to content

Commit

Permalink
separate 24.04 source build from docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasw committed Aug 30, 2024
1 parent 373b483 commit 396bf92
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 10 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ubuntu_22_04_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
jobs:
ubuntu2204docker:
runs-on: ubuntu-22.04
# env:
steps:
- name: git clone [email protected]:lucasw/ros_from_src
uses: actions/checkout@v2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:

jobs:
ubuntu2404dockeron2204:
ubuntu2404:
runs-on: ubuntu-24.04
# env:
steps:
Expand Down Expand Up @@ -40,11 +40,3 @@ jobs:
run: |
cd staging
underlay_ws/catkin.sh
- name: docker build from source 24.04
run: |
cd ros_from_src
docker build --build-arg IMAGE=ubuntu:24.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2404
# TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed
# apt debian science ros packages
23 changes: 23 additions & 0 deletions .github/workflows/ubuntu_24_04_docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Ubuntu 24.04 Noetic ROS build from source in docker

on:
push:
workflow_dispatch:

jobs:
ubuntu2404docker:
runs-on: ubuntu-24.04
steps:
- name: git clone [email protected]:lucasw/ros_from_src
uses: actions/checkout@v4
with:
path: ros_from_src
submodules: recursive

- name: docker build from source 24.04
run: |
cd ros_from_src
docker build --build-arg IMAGE=ubuntu:24.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2404
# TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed
# apt debian science ros packages

0 comments on commit 396bf92

Please sign in to comment.