Skip to content

Commit 32af2c5

Browse files
author
Shardul Natu
committed
contrib: wire up osxkeychain in contrib/Makefile on macOS
When running "make test" with TEST_CONTRIB_TOO=yes (which is default in macOS CI workflows), $(MAKE) -C contrib/ test is invoked. However, contrib/Makefile only invoked tests for diff-highlight and subtree, meaning git-credential-osxkeychain was never built or verified during standard CI test runs. Add a "test" target to contrib/credential/osxkeychain/Makefile that depends on building git-credential-osxkeychain. Additionally, wire up credential/osxkeychain in contrib/Makefile under "all", "test", and "clean" whenever running on macOS (Darwin). This ensures that running "make test" or "make all" in contrib on macOS automatically builds and links git-credential-osxkeychain, preventing future build or symbol linking regressions from slipping through CI. Signed-off-by: Shardul Natu <snatu@google.com>
1 parent a999be6 commit 32af2c5

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

contrib/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
-include ../config.mak.autogen
2+
-include ../config.mak
3+
4+
ifeq ($(uname_S),Darwin)
5+
OS_CONTRIB += credential/osxkeychain
6+
endif
7+
18
all::
9+
$(foreach dir,$(OS_CONTRIB),$(MAKE) -C $(dir) $@;)
210

311
test::
412
$(MAKE) -C diff-highlight $@
513
$(MAKE) -C subtree $@
14+
$(foreach dir,$(OS_CONTRIB),$(MAKE) -C $(dir) $@;)
615

716
clean::
817
$(MAKE) -C contacts $@
918
$(MAKE) -C diff-highlight $@
1019
$(MAKE) -C subtree $@
20+
$(foreach dir,$(OS_CONTRIB),$(MAKE) -C $(dir) $@;)

contrib/credential/osxkeychain/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ install:
1010
clean:
1111
$(MAKE) -C ../../.. clean-git-credential-osxkeychain
1212

13-
.PHONY: all git-credential-osxkeychain install clean
13+
test: git-credential-osxkeychain
14+
15+
.PHONY: all git-credential-osxkeychain install clean test

0 commit comments

Comments
 (0)