Skip to content

Commit 233a26f

Browse files
committed
Do not validate the SwiftPM plugins when buidling inside Jenkins.
1 parent dfca4b4 commit 233a26f

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

bin/build_jenkins.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ main() {
5555

5656
echo "### Build VimR"
5757

58-
release_spec_file=release.spec.sh ./bin/build_release.sh
58+
is_jenkins=true release_spec_file=release.spec.sh ./bin/build_release.sh
5959

6060
if [[ "${create_gh_release}" == false ]]; then
6161
echo "### No github release, so exiting after building"

bin/build_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ build_release() {
6565
fi
6666
popd >/dev/null
6767

68-
clean=true notarize=true ./bin/build_vimr.sh
68+
is_jenkins=${is_jenkins:-false} clean=true notarize=true ./bin/build_vimr.sh
6969

7070
pushd "${build_folder_path}" >/dev/null
7171
tar cjf "VimR-${marketing_version}.tar.bz2" VimR.app

bin/build_vimr.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,30 @@ set -Eeuo pipefail
44
readonly strip_symbols=${strip_symbols:-true}
55
readonly notarize=${notarize:?"true or false"}
66
readonly clean=${clean:?"true or false"}
7+
readonly is_jenkins=${is_jenkins:-false}
78

89
build_vimr() {
910
local -r build_path=$1
11+
local plugin_flag=""
12+
13+
if [[ "${is_jenkins}" == true ]]; then
14+
plugin_flag="-skipPackagePluginValidation"
15+
fi
16+
1017

1118
echo "### Xcodebuilding"
1219
rm -rf "${build_path}"
1320
if [[ "${clean}" == true ]]; then
1421
xcodebuild \
1522
-configuration Release -derivedDataPath "${build_path}" \
1623
-workspace VimR.xcworkspace -scheme VimR \
24+
${plugin_flag} \
1725
clean build
1826
else
1927
xcodebuild \
2028
-configuration Release -derivedDataPath "${build_path}" \
2129
-workspace VimR.xcworkspace -scheme VimR \
30+
${plugin_flag} \
2231
build
2332
fi
2433
}

0 commit comments

Comments
 (0)