Skip to content

Commit 6774d77

Browse files
committed
CI: include the build type in the dependency cache stamp
build.sh reuses a cached ci/ when the three version numbers in versions.txt match, so a cached Debug build satisfies a Release build and the rebuild is skipped.
1 parent 39174fe commit 6774d77

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

‎build.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ if [ "$CIBUILDWHEEL" = "1" ]; then
8383
fi
8484
fi
8585

86-
# Use cached dependencies if they match the requested versions.
86+
# Use cached dependencies if they match the requested versions and build type.
8787
if [ -f ci/versions.txt ] && \
8888
grep -q "^LIBGIT2_VERSION=$LIBGIT2_VERSION$" ci/versions.txt && \
8989
grep -q "^LIBSSH2_VERSION=$LIBSSH2_VERSION$" ci/versions.txt && \
90-
grep -q "^OPENSSL_VERSION=$OPENSSL_VERSION$" ci/versions.txt; then
90+
grep -q "^OPENSSL_VERSION=$OPENSSL_VERSION$" ci/versions.txt && \
91+
grep -q "^BUILD_TYPE=$BUILD_TYPE$" ci/versions.txt; then
9192
echo "Using cached dependencies"
9293
exit 0
9394
fi
@@ -216,6 +217,7 @@ if [ "$CIBUILDWHEEL" = "1" ]; then
216217
LIBGIT2_VERSION=$LIBGIT2_VERSION
217218
LIBSSH2_VERSION=$LIBSSH2_VERSION
218219
OPENSSL_VERSION=$OPENSSL_VERSION
220+
BUILD_TYPE=$BUILD_TYPE
219221
EOF
220222
if [ "$KERNEL" = "Darwin" ]; then
221223
echo "PREFIX " $PREFIX

0 commit comments

Comments
 (0)