Update aports-ros-experimental dir (#84)

seqsense · May 28, 2024 · b39bfbf · b39bfbf
1 parent ed064e0
commit b39bfbf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -4,33 +4,27 @@ ROS_DISTRO             ?= noetic
 ROS_PYTHON_VERSION     ?= 3
 ROS_DISTRIBUTION_TYPE  ?= ros1
 
-DISTRO_DIR              = $(ROS_DISTRO).v$(ALPINE_VERSION)
+IMAGE_TAG               = $(ROS_DISTRO).v$(ALPINE_VERSION)
 
 .PHONY: build-updater
 build-updater:
-	docker build -t $(UPDATER_NAME):$(DISTRO_DIR) \
+	docker build -t $(UPDATER_NAME):$(IMAGE_TAG) \
 		--build-arg ROS_DISTRO=$(ROS_DISTRO) \
 		--build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
 		.
 
 .PHONY: run
-run: $(DISTRO_DIR)
-
-.PHONY: dry-run
-dry-run: $(DISTRO_DIR)-dry
-
-.PHONY: $(DISTRO_DIR)
-$(DISTRO_DIR):
+run:
 	docker run --rm \
 		-v ${HOME}/.netrc:/root/.netrc:ro \
 		-e ROS_PYTHON_VERSION=$(ROS_PYTHON_VERSION) \
 		-e ROS_DISTRIBUTION_TYPE=$(ROS_DISTRIBUTION_TYPE) \
-		$(UPDATER_NAME):$(DISTRO_DIR) $(DISTRO_DIR)
+		$(UPDATER_NAME):$(IMAGE_TAG)
 
-.PHONY: $(DISTRO_DIR)-dry
-$(DISTRO_DIR)-dry:
+.PHONY: dry-run
+dry-run:
 	docker run --rm \
 		-v ${HOME}/.netrc:/root/.netrc:ro \
 		-e ROS_PYTHON_VERSION=$(ROS_PYTHON_VERSION) \
 		-e ROS_DISTRIBUTION_TYPE=$(ROS_DISTRIBUTION_TYPE) \
-		$(UPDATER_NAME):$(DISTRO_DIR) -d $(DISTRO_DIR)
+		$(UPDATER_NAME):$(IMAGE_TAG) -d
diff --git a/update-repo.sh b/update-repo.sh
@@ -11,7 +11,7 @@ done
 
 shift $((OPTIND - 1))
 
-aports_dir=aports/ros/$1
+aports_dir=aports/v${ALPINE_VERSION}/ros/${ROS_DISTRO}
 
 # env vars:
 #   APORTS_SLUG_UPSTREAM
@@ -119,7 +119,7 @@ done \
 
 # Commit changes and create PullRequest
 
-git ${git_common_opt} add ros
+git ${git_common_opt} add v${ALPINE_VERSION}/ros
 if git ${git_common_opt} diff --cached --exit-code; then
   echo "No update found"
 else