Fix failing Mac CI tests on 21.x (#15473)
I also removed the Codespell workflow since we're no longer using that
on main.
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
deleted file mode 100644
index 887c8a2..0000000
--- a/.github/workflows/codespell.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# GitHub Action to automate the identification of common misspellings in text files.
-# https://github.com/codespell-project/actions-codespell
-# https://github.com/codespell-project/codespell
-name: codespell
-on: [push, pull_request]
-jobs:
- codespell:
- name: Check for spelling errors
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: codespell-project/actions-codespell@master
- with:
- check_filenames: true
- skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml
- ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,falsy,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',ro,te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur"
diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
index d9677e9..69e804e 100755
--- a/kokoro/macos/prepare_build_macos_rc
+++ b/kokoro/macos/prepare_build_macos_rc
@@ -15,7 +15,7 @@
##
# Select Xcode version
-export DEVELOPER_DIR=/Applications/Xcode_14.app/Contents/Developer
+export DEVELOPER_DIR=/Applications/Xcode_14.1.app/Contents/Developer
sudo xcode-select -s "${DEVELOPER_DIR}"
##
@@ -25,11 +25,6 @@
export CXX=g++
##
-# Install Python 2 by default
-eval "$(pyenv init -)"
-pyenv install -v -s 2.7.18 && pyenv global 2.7.18
-
-##
# Install Tox
if [[ "${KOKORO_INSTALL_TOX:-}" == "yes" ]] ; then
