Skip to content

Commit

Permalink
macOS codesigning: only attempt if $MACOS_CODESIGN_IDENTITY is set (#…
Browse files Browse the repository at this point in the history
…33228)

This has the following advantages:

* It allows our buildbots to pass in which code signing identity they
want to use (rather than having the identity hash hardcoded in our build
system)

* It stops blindly attempting to codesign on random user's machines

* It causes codesign failure to stop the build

(cherry picked from commit 0760842)
  • Loading branch information
staticfloat authored and KristofferC committed Sep 19, 2019
1 parent c780b9c commit adfae3c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion contrib/mac/app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ dmg/$(APP_NAME): startup.applescript julia.icns
-mkdir -p $@/Contents/Resources/julia
make -C $(JULIAHOME) binary-dist
tar zxf $(JULIAHOME)/$(JULIA_BINARYDIST_FILENAME).tar.gz -C $@/Contents/Resources/julia --strip-components 1
-codesign -s "AFB379C0B4CBD9DB9A762797FC2AB5460A2B0DBE" --deep $@
if [ -n "$$MACOS_CODESIGN_IDENTITY" ]; then \
echo "Codesigning with identity $$MACOS_CODESIGN_IDENTITY"; \
codesign -s "$$MACOS_CODESIGN_IDENTITY" -v --deep $@; \
else \
true; \
fi

ROOTFILES := $(shell ls -ld dmg/*.app *.dmg 2> /dev/null | awk '{print $$3}')
clean:
Expand Down

0 comments on commit adfae3c

Please sign in to comment.