Skip to content

Commit 71c640d

Browse files
authored
Merge pull request #626 from mbaldessari/ordering
Cleanup ordering of variables in Makefile
2 parents 5515ead + 88dca00 commit 71c640d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@ EXTRA_PLAYBOOK_OPTS ?=
2525
# INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:394248,registry-proxy.engineering.redhat.com/rh-osbs/iib:394249
2626
INDEX_IMAGES ?=
2727

28-
# This is to ensure that whether we start with a git@ or https:// URL, we end up with an https:// URL
29-
# This is because we expect to use tokens for repo authentication as opposed to SSH keys
30-
TARGET_REPO=$(shell git ls-remote --get-url --symref $(TARGET_ORIGIN) | sed -e 's/.*URL:[[:space:]]*//' -e 's%^git@%%' -e 's%^https://%%' -e 's%:%/%' -e 's%^%https://%')
3128
# git branch --show-current is also available as of git 2.22, but we will use this for compatibility
3229
TARGET_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
3330

3431
#default to the branch remote
3532
TARGET_ORIGIN ?= $(shell git config branch.$(TARGET_BRANCH).remote)
3633

34+
# This is to ensure that whether we start with a git@ or https:// URL, we end up with an https:// URL
35+
# This is because we expect to use tokens for repo authentication as opposed to SSH keys
36+
TARGET_REPO=$(shell git ls-remote --get-url --symref $(TARGET_ORIGIN) | sed -e 's/.*URL:[[:space:]]*//' -e 's%^git@%%' -e 's%^https://%%' -e 's%:%/%' -e 's%^%https://%')
37+
3738
UUID_FILE ?= ~/.config/validated-patterns/pattern-uuid
3839
UUID_HELM_OPTS ?=
3940

0 commit comments

Comments
 (0)