Skip to content

Commit 2099814

Browse files
committed
Fix disk image build target (macvim-dmg) permission issues on Travis
create-dmg uses osascript calls to prettify the created dmg file, which has not been working in Travis CI for a while since it would pop up a dialog box asking for permission in the later macOS versions, and there's no way to interact with it in CI. The old version of create-dmg silently handles the failure but the new version just fails the build, so we need to manually pass in --skip-jenkins flag to skip the prettify step. This is still ok, because currently the maintainer still has to manually re-build and re-sign the dmg file locally after Travis built it to add signing and notarization to the app, so the dmg file built by Travis is just an intermediate step, and not going to be used for the final release.
1 parent b350d23 commit 2099814

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ jobs:
122122
<<: *caches
123123
script: skip
124124
before_deploy:
125-
- make -C src macvim-dmg
125+
# Use the --skip-jenkins flag to skip the prettify osascript calls which will fail due to permission issues in Travis CI's Mac environment.
126+
- make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins
126127
deploy:
127128
provider: releases
128129
token:

src/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3747,7 +3747,7 @@ macvim-dmg:
37473747
--icon-size 80 \
37483748
--icon MacVim.app 240 320 \
37493749
--app-drop-link 410 320 \
3750-
$(RELEASEDIR)/$(DMGFILE) $(DMGDIR)
3750+
$(CREATEDMG_FLAGS) $(RELEASEDIR)/$(DMGFILE) $(DMGDIR)
37513751

37523752
macvimclean:
37533753
if test -d MacVim; then \
@@ -3758,8 +3758,8 @@ macvimclean:
37583758
macvim-dmg-release: macvim-signed macvim-dmg
37593759
MacVim/scripts/sign-developer-id $(RELEASEDIR)/MacVim.dmg $(ENTITLEMENTS)
37603760
MacVim/scripts/notarize-dmg $(RELEASEDIR)/MacVim.dmg
3761-
echo "--------------------"
3762-
echo "Release MacVim built!"
3761+
@echo "----------------------------------------"
3762+
@echo "Release MacVim built!"
37633763

37643764
# Install only language files to a dest folder. Subset of "install-languages".
37653765
macvim-install-languages:

0 commit comments

Comments
 (0)