Enable to specify branch by PR parameter.

Author: usualoma

CHANGELOG.md

@@ -6,10 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.4] - 2021-01-13
+
 ### Added
 
 * Enable to specify branch by "#" in REPO
     * e.g. REPO="https://github.com/user/mt-plugin-XXX.git#main"
+* Enable to specify branch by PR parameter
+    * e.g. PR="https://github.com/movabletype/movabletype/pull/1527"
 
 ## [1.0.3] - 2020-10-22
 

Makefile

@@ -96,14 +96,17 @@ ifneq (${ARCHIVE},)
 	${MAKEFILE_DIR}/bin/extract-archive ${BASE_ARCHIVE_PATH} ${MT_HOME_PATH} $(shell echo ${ARCHIVE} | tr ',' ' ')
 endif
 
-	$(eval export _ARGS=$(shell UPDATE_BRANCH=${UPDATE_BRANCH} ${MAKEFILE_DIR}/bin/setup-environment --recipe "$(shell echo ${RECIPE} | tr ',' ' ')" --repo "$(shell echo ${REPO} | tr ',' ' ')"))
+	$(eval export _ARGS=$(shell UPDATE_BRANCH=${UPDATE_BRANCH} ${MAKEFILE_DIR}/bin/setup-environment --recipe "$(shell echo ${RECIPE} | tr ',' ' ')" --repo "$(shell echo ${REPO} | tr ',' ' ')" --pr "$(shell echo ${PR} | tr ',' ' ')"))
 ifneq (${RECIPE},)
 	@perl -e 'exit(length($$ENV{_ARGS}) > 0 ? 0 : 1)'
 endif
 ifneq (${REPO},)
 	@perl -e 'exit(length($$ENV{_ARGS}) > 0 ? 0 : 1)'
 endif
-	${MAKE} up-common-invoke-docker-compose MT_HOME_PATH=${MT_HOME_PATH} ${_ARGS} RECIPE="" REPO="" $(shell [ -n "${DOCKER_MT_IMAGE}" ] && echo "DOCKER_MT_IMAGE=${DOCKER_MT_IMAGE}") $(shell [ -n "${DOCKER_MYSQL_IMAGE}" ] && echo "DOCKER_MYSQL_IMAGE=${DOCKER_MYSQL_IMAGE}")
+ifneq (${PR},)
+	@perl -e 'exit(length($$ENV{_ARGS}) > 0 ? 0 : 1)'
+endif
+	${MAKE} up-common-invoke-docker-compose MT_HOME_PATH=${MT_HOME_PATH} ${_ARGS} RECIPE="" REPO="" PR="" $(shell [ -n "${DOCKER_MT_IMAGE}" ] && echo "DOCKER_MT_IMAGE=${DOCKER_MT_IMAGE}") $(shell [ -n "${DOCKER_MYSQL_IMAGE}" ] && echo "DOCKER_MYSQL_IMAGE=${DOCKER_MYSQL_IMAGE}")
 
 up-common-invoke-docker-compose: setup-mysql-volume
 	@echo MT_HOME_PATH=${MT_HOME_PATH}

bin/git-clone

@@ -16,7 +16,12 @@ git fetch --tags --prune
 if [ "$UPDATE_BRANCH" = "yes" -o "$UPDATE_BRANCH" = "1" ] && [ -n "$branch" ]; then
     git checkout .
     git clean -f
+
+    if [[ $branch == pull/* ]]; then
+        git fetch origin refs/$branch:refs/remotes/origin/$branch
+    fi
     git checkout $branch
+
     if git symbolic-ref --short HEAD 2>/dev/null; then
       git rebase $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
     fi

bin/setup-environment

@@ -20,6 +20,7 @@ use File::Temp qw(tempfile tmpnam);
 GetOptions(
     'recipe=s' => \my $recipes,
     'repo=s'   => \my $repos,
+    'pr=s'     => \my $pull_reqs,
 );
 
 my $recipe_dir    = realpath("$FindBin::Bin/../recipe");
@@ -61,8 +62,14 @@ sub handle_recipe {
         }
 
         if ($repo) {
-            my $cmd
-                = "$git_clone_cmd $repo $dest_dir @{[$data->{$k}{branch} || '']}";
+            my $branch = $data->{$k}{branch} || '';
+            for my $pr ( split /\s+/, $pull_reqs ) {
+                my ($pr_repo, $pr_id) = ($pr =~ m{([^/]+)/(pull/\d+)});
+                next unless $pr_repo && $pr_id;
+                $branch = $pr_id . '/head' if basename($dest_dir) eq $pr_repo;
+            }
+
+            my $cmd = "$git_clone_cmd $repo $dest_dir $branch";
             my $res = `$cmd 2>&1` || "";
             die "$res\nGot an error: $cmd" if $?;