From 5601b7b88adecd60440dd5d2f181645dda6cc858 Mon Sep 17 00:00:00 2001 From: artivis Date: Fri, 27 Sep 2024 09:58:33 +0200 Subject: [PATCH 1/3] mv pi-gadget -> turtlebot3c-gadget Signed-off-by: artivis --- {pi-gadget => turtlebot3c-gadget}/Makefile | 0 .../configs/core/cmdline.txt | 0 .../configs/core/config.txt.arm64 | 0 {pi-gadget => turtlebot3c-gadget}/gadget.yaml | 0 .../helpers/cross-sources.list | 0 {pi-gadget => turtlebot3c-gadget}/psplash/config | 0 .../psplash/core_black-orange_st_hex.png | Bin .../psplash/core_orange_140.png | Bin .../psplash/core_orange_280.png | Bin .../psplash/font-gen.sh | 0 .../psplash/initrd/scripts/init-bottom/ORDER | 0 .../initrd/scripts/init-bottom/disable-getty | 0 .../initrd/scripts/init-bottom/end.psplash.service | 0 .../scripts/init-bottom/kiosk.autoconnect.service | 0 .../psplash/initrd/scripts/init-top/ORDER | 0 .../psplash/initrd/scripts/init-top/psplash | 0 .../psplash/psplash.patch | 0 {pi-gadget => turtlebot3c-gadget}/snap/gui/icon.png | Bin .../snap/hooks/configure | 0 {pi-gadget => turtlebot3c-gadget}/snapcraft.yaml | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename {pi-gadget => turtlebot3c-gadget}/Makefile (100%) rename {pi-gadget => turtlebot3c-gadget}/configs/core/cmdline.txt (100%) rename {pi-gadget => turtlebot3c-gadget}/configs/core/config.txt.arm64 (100%) rename {pi-gadget => turtlebot3c-gadget}/gadget.yaml (100%) rename {pi-gadget => turtlebot3c-gadget}/helpers/cross-sources.list (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/config (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/core_black-orange_st_hex.png (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/core_orange_140.png (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/core_orange_280.png (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/font-gen.sh (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/initrd/scripts/init-bottom/ORDER (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/initrd/scripts/init-bottom/disable-getty (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/initrd/scripts/init-bottom/end.psplash.service (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/initrd/scripts/init-bottom/kiosk.autoconnect.service (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/initrd/scripts/init-top/ORDER (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/initrd/scripts/init-top/psplash (100%) rename {pi-gadget => turtlebot3c-gadget}/psplash/psplash.patch (100%) rename {pi-gadget => turtlebot3c-gadget}/snap/gui/icon.png (100%) rename {pi-gadget => turtlebot3c-gadget}/snap/hooks/configure (100%) rename {pi-gadget => turtlebot3c-gadget}/snapcraft.yaml (100%) diff --git a/pi-gadget/Makefile b/turtlebot3c-gadget/Makefile similarity index 100% rename from pi-gadget/Makefile rename to turtlebot3c-gadget/Makefile diff --git a/pi-gadget/configs/core/cmdline.txt b/turtlebot3c-gadget/configs/core/cmdline.txt similarity index 100% rename from pi-gadget/configs/core/cmdline.txt rename to turtlebot3c-gadget/configs/core/cmdline.txt diff --git a/pi-gadget/configs/core/config.txt.arm64 b/turtlebot3c-gadget/configs/core/config.txt.arm64 similarity index 100% rename from pi-gadget/configs/core/config.txt.arm64 rename to turtlebot3c-gadget/configs/core/config.txt.arm64 diff --git a/pi-gadget/gadget.yaml b/turtlebot3c-gadget/gadget.yaml similarity index 100% rename from pi-gadget/gadget.yaml rename to turtlebot3c-gadget/gadget.yaml diff --git a/pi-gadget/helpers/cross-sources.list b/turtlebot3c-gadget/helpers/cross-sources.list similarity index 100% rename from pi-gadget/helpers/cross-sources.list rename to turtlebot3c-gadget/helpers/cross-sources.list diff --git a/pi-gadget/psplash/config b/turtlebot3c-gadget/psplash/config similarity index 100% rename from pi-gadget/psplash/config rename to turtlebot3c-gadget/psplash/config diff --git a/pi-gadget/psplash/core_black-orange_st_hex.png b/turtlebot3c-gadget/psplash/core_black-orange_st_hex.png similarity index 100% rename from pi-gadget/psplash/core_black-orange_st_hex.png rename to turtlebot3c-gadget/psplash/core_black-orange_st_hex.png diff --git a/pi-gadget/psplash/core_orange_140.png b/turtlebot3c-gadget/psplash/core_orange_140.png similarity index 100% rename from pi-gadget/psplash/core_orange_140.png rename to turtlebot3c-gadget/psplash/core_orange_140.png diff --git a/pi-gadget/psplash/core_orange_280.png b/turtlebot3c-gadget/psplash/core_orange_280.png similarity index 100% rename from pi-gadget/psplash/core_orange_280.png rename to turtlebot3c-gadget/psplash/core_orange_280.png diff --git a/pi-gadget/psplash/font-gen.sh b/turtlebot3c-gadget/psplash/font-gen.sh similarity index 100% rename from pi-gadget/psplash/font-gen.sh rename to turtlebot3c-gadget/psplash/font-gen.sh diff --git a/pi-gadget/psplash/initrd/scripts/init-bottom/ORDER b/turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/ORDER similarity index 100% rename from pi-gadget/psplash/initrd/scripts/init-bottom/ORDER rename to turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/ORDER diff --git a/pi-gadget/psplash/initrd/scripts/init-bottom/disable-getty b/turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/disable-getty similarity index 100% rename from pi-gadget/psplash/initrd/scripts/init-bottom/disable-getty rename to turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/disable-getty diff --git a/pi-gadget/psplash/initrd/scripts/init-bottom/end.psplash.service b/turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/end.psplash.service similarity index 100% rename from pi-gadget/psplash/initrd/scripts/init-bottom/end.psplash.service rename to turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/end.psplash.service diff --git a/pi-gadget/psplash/initrd/scripts/init-bottom/kiosk.autoconnect.service b/turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/kiosk.autoconnect.service similarity index 100% rename from pi-gadget/psplash/initrd/scripts/init-bottom/kiosk.autoconnect.service rename to turtlebot3c-gadget/psplash/initrd/scripts/init-bottom/kiosk.autoconnect.service diff --git a/pi-gadget/psplash/initrd/scripts/init-top/ORDER b/turtlebot3c-gadget/psplash/initrd/scripts/init-top/ORDER similarity index 100% rename from pi-gadget/psplash/initrd/scripts/init-top/ORDER rename to turtlebot3c-gadget/psplash/initrd/scripts/init-top/ORDER diff --git a/pi-gadget/psplash/initrd/scripts/init-top/psplash b/turtlebot3c-gadget/psplash/initrd/scripts/init-top/psplash similarity index 100% rename from pi-gadget/psplash/initrd/scripts/init-top/psplash rename to turtlebot3c-gadget/psplash/initrd/scripts/init-top/psplash diff --git a/pi-gadget/psplash/psplash.patch b/turtlebot3c-gadget/psplash/psplash.patch similarity index 100% rename from pi-gadget/psplash/psplash.patch rename to turtlebot3c-gadget/psplash/psplash.patch diff --git a/pi-gadget/snap/gui/icon.png b/turtlebot3c-gadget/snap/gui/icon.png similarity index 100% rename from pi-gadget/snap/gui/icon.png rename to turtlebot3c-gadget/snap/gui/icon.png diff --git a/pi-gadget/snap/hooks/configure b/turtlebot3c-gadget/snap/hooks/configure similarity index 100% rename from pi-gadget/snap/hooks/configure rename to turtlebot3c-gadget/snap/hooks/configure diff --git a/pi-gadget/snapcraft.yaml b/turtlebot3c-gadget/snapcraft.yaml similarity index 100% rename from pi-gadget/snapcraft.yaml rename to turtlebot3c-gadget/snapcraft.yaml From 08fc0eb6d53e782335a7e81fa3ba039d3830bddb Mon Sep 17 00:00:00 2001 From: artivis Date: Fri, 27 Sep 2024 10:01:35 +0200 Subject: [PATCH 2/3] update readme Signed-off-by: artivis --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1b57171..7661638 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ Turtlebot3c Ubuntu Core image The image contains the TurtleBot3c snaps: + - [turtlebot3c-bringup](https://snapcraft.io/turtlebot3c-bringup) - [turtlebot3c-nav](https://snapcraft.io/turtlebot3c-nav) - [turtlebot3c-teleop](https://snapcraft.io/turtlebot3c-teleop) @@ -18,7 +19,7 @@ Mind that you need avahi installed on your remote machine, see e.g. `snap instal Remember to set up the `ROS_MASTER_URI` to point to the robot: -``` +```bash ROS_MASTER_URI=http://turtelbot3c.local:11311/ ``` @@ -36,8 +37,8 @@ and decompressing it, the image can be written to an SD card. Build the gadget snap with snapcraft: -``` -cd pi-gadget +```bash +cd turtlebot3c-gadget snapcraft cd ../ ``` @@ -46,7 +47,7 @@ cd ../ [Sign the model](https://ubuntu.com/core/docs/sign-model-assertion) with your key: -``` +```bash snap sign -k tb3c-key turtlebot3c-model.json > turtlebot3c.model ``` @@ -54,11 +55,10 @@ snap sign -k tb3c-key turtlebot3c-model.json > turtlebot3c.model [Generate the image](https://ubuntu.com/core/docs/build-write-image): -``` -ubuntu-image snap turtlebot3c.model --snap ./pi-gadget/turtlebot3c-pi_20-1_arm64.snap +```bash +ubuntu-image snap turtlebot3c.model --snap ./turtlebot3c-gadget/turtlebot3c-pi_*_arm64.snap ``` ### Boot the image Write the generated image on an SD card with the [rpi-imager](https://snapcraft.io/rpi-imager) and boot. - From ec8af65451ae16766aca66837a3a32cc3bab224c Mon Sep 17 00:00:00 2001 From: artivis Date: Fri, 27 Sep 2024 10:01:49 +0200 Subject: [PATCH 3/3] update ci Signed-off-by: artivis --- .github/workflows/ubuntu-core-image.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ubuntu-core-image.yaml b/.github/workflows/ubuntu-core-image.yaml index 4e060d3..ad0e551 100644 --- a/.github/workflows/ubuntu-core-image.yaml +++ b/.github/workflows/ubuntu-core-image.yaml @@ -2,16 +2,16 @@ name: TurtleBot3c Ubuntu Core image on: push: branches: - - main + - noetic tags: - '*' pull_request: branches: - - main + - noetic workflow_dispatch: jobs: - turtlebot3c-pi-gadget-snap: + turtlebot3c-gadget-snap: runs-on: ubuntu-latest steps: - name: Checkout repo @@ -20,27 +20,27 @@ jobs: id: build-snap uses: snapcore/action-build@v1 with: - path: pi-gadget + path: turtlebot3c-gadget - name: Upload snap artifact uses: actions/upload-artifact@v4 with: - name: turtlebot3c-pi-gadget-snap + name: turtlebot3c-gadget-snap path: ${{ steps.build-snap.outputs.snap }} ubuntu-image: runs-on: ubuntu-latest - needs: turtlebot3c-pi-gadget-snap + needs: turtlebot3c-gadget-snap steps: - name: Checkout repo uses: actions/checkout@v4 - name: Download gadget snap uses: actions/download-artifact@v4 with: - name: turtlebot3c-pi-gadget-snap - path: pi-gadget + name: turtlebot3c-gadget-snap + path: gadget - name: Build the Ubuntu Core image run: | sudo snap install ubuntu-image --classic - ubuntu-image snap turtlebot3c.model --snap ./pi-gadget/turtlebot3c-pi_*_arm64.snap + ubuntu-image snap turtlebot3c.model --snap ./gadget/turtlebot3c*.snap - name: Upload snap artifact uses: actions/upload-artifact@v4 with: