From 369b6f9180cd6d55bcd39a7c4229ebe5e8e204eb Mon Sep 17 00:00:00 2001 From: marcmaro Date: Tue, 9 Apr 2024 08:40:40 +0200 Subject: [PATCH 1/3] use snapcraft7 env. variables --- ros2-base-humble-deb/snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros2-base-humble-deb/snap/snapcraft.yaml b/ros2-base-humble-deb/snap/snapcraft.yaml index 7c5f5ac..e81bf99 100644 --- a/ros2-base-humble-deb/snap/snapcraft.yaml +++ b/ros2-base-humble-deb/snap/snapcraft.yaml @@ -31,7 +31,7 @@ parts: helper: plugin: python build-environment: - - PYTHONPATH: "$SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages" + - PYTHONPATH: "$CRAFT_PART_INSTALL/usr/lib/python3/dist-packages" stage-packages: - python3-wheel python-packages: From b08558bee2bf949ca0efe5c8d0fa753803cc09cc Mon Sep 17 00:00:00 2001 From: marcmaro Date: Tue, 9 Apr 2024 08:43:20 +0200 Subject: [PATCH 2/3] snapcraftctl build -> craftctl default --- simple-listener-cpp/snap/snapcraft.yaml | 2 +- simple-listener-dl-py/snap/snapcraft.yaml | 4 ++-- simple-listener-py/snap/snapcraft.yaml | 2 +- simple-talker-dl-py/snap/snapcraft.yaml | 4 ++-- simple-talker-py/snap/snapcraft.yaml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/simple-listener-cpp/snap/snapcraft.yaml b/simple-listener-cpp/snap/snapcraft.yaml index 2f1891b..5502e8d 100644 --- a/simple-listener-cpp/snap/snapcraft.yaml +++ b/simple-listener-cpp/snap/snapcraft.yaml @@ -13,7 +13,7 @@ parts: plugin: dump source: install override-build: | - snapcraftctl build + craftctl default wrapper-scripts: plugin: dump diff --git a/simple-listener-dl-py/snap/snapcraft.yaml b/simple-listener-dl-py/snap/snapcraft.yaml index 448e487..57d2aa5 100644 --- a/simple-listener-dl-py/snap/snapcraft.yaml +++ b/simple-listener-dl-py/snap/snapcraft.yaml @@ -16,8 +16,8 @@ parts: plugin: dump source: install stage-packages: [libpython3.10] - override-build: | - snapcraftctl build + override-build: | + craftctl default wrapper-scripts: plugin: dump diff --git a/simple-listener-py/snap/snapcraft.yaml b/simple-listener-py/snap/snapcraft.yaml index fe363d2..953d44a 100644 --- a/simple-listener-py/snap/snapcraft.yaml +++ b/simple-listener-py/snap/snapcraft.yaml @@ -14,7 +14,7 @@ parts: source: install stage-packages: [libpython3.10] override-build: | - snapcraftctl build + craftctl default wrapper-scripts: plugin: dump diff --git a/simple-talker-dl-py/snap/snapcraft.yaml b/simple-talker-dl-py/snap/snapcraft.yaml index 485096d..7e3f454 100644 --- a/simple-talker-dl-py/snap/snapcraft.yaml +++ b/simple-talker-dl-py/snap/snapcraft.yaml @@ -16,8 +16,8 @@ parts: plugin: dump source: install stage-packages: [libpython3.10] - override-build: | - snapcraftctl build + override-build: | + craftctl default wrapper-scripts: plugin: dump diff --git a/simple-talker-py/snap/snapcraft.yaml b/simple-talker-py/snap/snapcraft.yaml index e6db05d..ccef39e 100644 --- a/simple-talker-py/snap/snapcraft.yaml +++ b/simple-talker-py/snap/snapcraft.yaml @@ -14,8 +14,8 @@ parts: plugin: dump source: install stage-packages: [libpython3.10] - override-build: | - snapcraftctl build + override-build: | + craftctl default wrapper-scripts: plugin: dump From 5d93f2c87404f39f53ff26b42426902be6e18843 Mon Sep 17 00:00:00 2001 From: marcmaro Date: Tue, 9 Apr 2024 09:02:07 +0200 Subject: [PATCH 3/3] we need snapcraft7 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ee8855..2102545 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - run: sudo snap install snapcraft --channel=6.x/stable --classic + - run: sudo snap install snapcraft --channel=7.x/stable --classic - run: rosdep update - run: | cd simple-listener-py