Skip to content

Commit b8ca766

Browse files
committed
fixup! Set up CI to link against Sparkle 1 when in legacy builds
Use better `ln` command, and make sure non-publish builds don't have Sparkle enabled so that it doesn't have to worry about using Sparkle 1 (since the OS is too old to use Sparkle 2), and to help test --disable-sparkle builds in the matrix.
1 parent 0667ce7 commit b8ca766

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/ci-macvim.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
8080
# Use Sparkle 1 because Sparkle 2 requires newer OS version than our legacy build.
8181
# Later, we pass the --enable-sparkle_1 flag to configure to set the corresponding ifdef.
82-
rm src/MacVim/Sparkle.framework && ln -s Sparkle_1.framework src/MacVim/Sparkle.framework
82+
ln -fhs Sparkle_1.framework src/MacVim/Sparkle.framework
8383
8484
# Set up, install, and cache gettext library for localization.
8585
#
@@ -158,6 +158,7 @@ jobs:
158158
else
159159
CONFOPT+=(
160160
--with-macarchs=x86_64
161+
--disable-sparkle # Don't include Sparkle for non-publish builds to avoid Sparkle 1 vs 2 issues, and to help test that this builds
161162
)
162163
fi
163164
if ${{ matrix.legacy == true }}; then

0 commit comments

Comments
 (0)