Skip to content

Commit

Permalink
Use local version of yadm by default (in testhost/scripthost)
Browse files Browse the repository at this point in the history
Also symlink instead of copy in that case, so that changes locally can
be reflected in the testhost directly, and print the used version in a
more readable format.
  • Loading branch information
erijo committed Jan 1, 2021
1 parent dcfa55c commit f67189c
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ usage:
@echo
@echo ' make testhost [version=VERSION]'
@echo ' - Create an ephemeral container for doing adhoc yadm testing. The'
@echo ' HEAD revision of yadm will be used unless "version" is'
@echo ' working copy version of yadm will be used unless "version" is'
@echo ' specified. "version" can be set to any commit, branch, tag, etc.'
@echo ' The targeted "version" will be retrieved from the repo, and'
@echo ' linked into the container as a local volume. Setting version to'
@echo ' "local" uses yadm from the current working tree.'
@echo ' linked into the container as a local volume.'
@echo
@echo ' make scripthost [version=VERSION]'
@echo ' - Create an ephemeral container for demonstrating a bug. After'
Expand Down Expand Up @@ -103,13 +102,15 @@ test:
fi

.PHONY: .testyadm
.testyadm: version ?= HEAD
.testyadm: version ?= local
.testyadm:
@echo "Using yadm version=\"$(version)\""
@rm -f $@
@if [ "$(version)" = "local" ]; then \
cp -f yadm $@; \
ln -sf yadm $@; \
echo "Using local yadm ($$(git describe --tags --dirty))"; \
else \
git show $(version):yadm > $@; \
echo "Using yadm version $$(git describe --tags $(version))"; \
fi
@chmod a+x $@

Expand Down

0 comments on commit f67189c

Please sign in to comment.