File tree 8 files changed +33
-32
lines changed
objectivec_cocoapods_integration
8 files changed +33
-32
lines changed Original file line number Diff line number Diff line change @@ -91,8 +91,8 @@ $(benchmarks_protoc_outputs_proto2_header): protoc_middleman2
91
91
92
92
initialize_submodule :
93
93
oldpwd=` pwd`
94
- cd $(top_srcdir ) && git submodule update --init -r third_party/benchmark && \
95
- cd third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make
94
+ cd $(top_srcdir ) && git submodule update --init -r third_party/benchmark && cd third_party/benchmark \
95
+ && cmake -DCMAKE_BUILD_TYPE=Release && make
96
96
cd $$ oldpwd
97
97
touch initialize_submodule
98
98
Original file line number Diff line number Diff line change 5
5
# Change to repo root
6
6
cd $( dirname $0 ) /../../..
7
7
8
+ # Fix locale issues in Monterey.
9
+ export LC_ALL=en_US.UTF-8
10
+
8
11
# Prepare worker environment to run tests
9
12
KOKORO_INSTALL_COCOAPODS=yes
10
13
source kokoro/macos/prepare_build_macos_rc
Original file line number Diff line number Diff line change 4
4
5
5
set -eux
6
6
7
+ export HOMEBREW_PREFIX=$( brew --prefix)
8
+
7
9
# #
8
10
# Select Xcode version
9
11
10
- # Remember to update the Xcode version when Xcode_11.3.app is not available.
11
- # If xcode is not available, it will probably encounter the failure for
12
- # "autom4te: need GNU m4 1.4 or later: /usr/bin/m4"
13
- # go/kokoro/userdocs/macos/selecting_xcode.md for more information.
14
- export DEVELOPER_DIR=/Applications/Xcode_11.3.app/Contents/Developer
12
+ # #
13
+ # Select Xcode version
14
+ export DEVELOPER_DIR=/Applications/Xcode_13.3.1.app/Contents/Developer
15
+ sudo xcode-select -s " ${DEVELOPER_DIR} "
15
16
16
17
# #
17
18
# Select C/C++ compilers
70
71
# Install Tox
71
72
72
73
if [[ " ${KOKORO_INSTALL_TOX:- } " == " yes" ]] ; then
73
- sudo python3 -m pip install --upgrade pip tox
74
+ pyenv install -v -s 3.7.13
75
+ pyenv global 3.7.13
76
+ sudo python -m pip install --upgrade pip tox tox-pyenv
74
77
fi
75
78
76
79
# #
77
- # Install RVM
78
-
80
+ # Setup RVM
79
81
if [[ " ${KOKORO_INSTALL_RVM:- } " == " yes" ]] ; then
80
- curl -sSL https://rvm.io/mpapis.asc | gpg --import -
81
- curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
82
-
83
- curl -sSL https://get.rvm.io | bash -s master --ruby
82
+ git config --global --add safe.directory $HOMEBREW_PREFIX /Library/Taps/homebrew/homebrew-cask
83
+ git config --global --add safe.directory $HOMEBREW_PREFIX /Library/Taps/homebrew/homebrew-core
84
+ git config --global --add safe.directory $HOMEBREW_PREFIX /Library/Taps/homebrew/homebrew-services
85
+ sudo chown -R $( whoami ) $HOME /.rvm/
84
86
fi
Original file line number Diff line number Diff line change @@ -12,8 +12,5 @@ export ARTIFACT_DIR=$(pwd)/artifacts
12
12
# ruby environment
13
13
bash kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
14
14
15
- gem install rubygems-update
16
- update_rubygems
17
-
18
15
# build artifacts
19
16
bash kokoro/release/ruby/macos/ruby/ruby_build.sh
Original file line number Diff line number Diff line change 2
2
3
3
set -ex
4
4
5
+ # Fix permissions
6
+ sudo chown -R $( whoami) $HOME /.rvm/
7
+ sudo chown -R $( whoami) /Library/Ruby/
8
+
5
9
set +ex # rvm script is very verbose and exits with errorcode
6
10
source $HOME /.rvm/scripts/rvm
7
11
set -e # rvm commands are very verbose
Original file line number Diff line number Diff line change 234
234
objectivec/generate_well_known_types.sh --check-only -j " ${NUM_MAKE_JOBS} "
235
235
236
236
header " Checking on the ObjC Runtime Code"
237
- objectivec/DevTools/pddm_tests.py
238
- if ! objectivec/DevTools/pddm.py --dry-run objectivec/* .[hm] objectivec/Tests/* .[hm] ; then
237
+ LOCAL_PYTHON=python
238
+ " ${LOCAL_PYTHON} " objectivec/DevTools/pddm_tests.py
239
+ if ! " ${LOCAL_PYTHON} " objectivec/DevTools/pddm.py --dry-run objectivec/* .[hm] objectivec/Tests/* .[hm] ; then
239
240
echo " "
240
241
echo " Update by running:"
241
242
echo " objectivec/DevTools/pddm.py objectivec/*.[hm] objectivec/Tests/*.[hm]"
@@ -289,7 +290,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
289
290
-disable-concurrent-destination-testing
290
291
)
291
292
;;
292
- 11.* | 12.* )
293
+ 11.* | 12.* | 13. * )
293
294
# Dropped 32bit as Apple doesn't seem support the simulators either.
294
295
XCODEBUILD_TEST_BASE_IOS+=(
295
296
-destination " platform=iOS Simulator,name=iPhone 8,OS=latest" # 64bit
@@ -357,6 +358,11 @@ if [[ "${DO_XCODE_TVOS_TESTS}" == "yes" ]] ; then
357
358
-destination " platform=tvOS Simulator,name=Apple TV 4K,OS=latest"
358
359
)
359
360
;;
361
+ 13.* )
362
+ XCODEBUILD_TEST_BASE_TVOS+=(
363
+ -destination " platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=latest"
364
+ )
365
+ ;;
360
366
* )
361
367
echo " "
362
368
echo " ATTENTION: Time to update the simulator targets for Xcode ${XCODE_VERSION} "
Original file line number Diff line number Diff line change @@ -128,7 +128,7 @@ do_test() {
128
128
# errors.
129
129
xcodebuild_args+=(
130
130
-sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
131
- -destination " platform=iOS Simulator,name=iPad 2 ,OS=9.3 "
131
+ -destination " platform=iOS Simulator,name=iPad Air (5th generation) ,OS=15.4 "
132
132
)
133
133
fi
134
134
Original file line number Diff line number Diff line change @@ -27,17 +27,6 @@ build_cpp() {
27
27
internal_build_cpp
28
28
make check -j$( nproc) || (cat src/test-suite.log; false)
29
29
cd conformance && make test_cpp && cd ..
30
-
31
- # The benchmark code depends on cmake, so test if it is installed before
32
- # trying to do the build.
33
- if [[ $( type cmake 2> /dev/null) ]]; then
34
- # Verify benchmarking code can build successfully.
35
- cd benchmarks && make cpp-benchmark && cd ..
36
- else
37
- echo " "
38
- echo " WARNING: Skipping validation of the bench marking code, cmake isn't installed."
39
- echo " "
40
- fi
41
30
}
42
31
43
32
build_cpp_tcmalloc () {
You can’t perform that action at this time.
0 commit comments