diff options
| author | Adam Cozzette <acozzette@google.com> | 2024-01-19 10:27:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 10:27:45 -0800 |
| commit | 86e94aced6a7fec0fac38b0331561e40a8c0ba6a (patch) | |
| tree | b7c50a2ac1257f1afc2040a0d98b97924d5253f9 | |
| parent | 7baba44c53dc7d2d89f34ac4eedd12144ea60caf (diff) | |
| download | protobuf-86e94aced6a7fec0fac38b0331561e40a8c0ba6a.tar.gz | |
Fix failing Mac CI tests on 3.19.x (#15485)
I also removed the Codespell workflow since we're no longer using this
on main.
| -rw-r--r-- | .github/workflows/codespell.yml | 16 | ||||
| -rwxr-xr-x | kokoro/macos/prepare_build_macos_rc | 8 |
2 files changed, 1 insertions, 23 deletions
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml deleted file mode 100644 index b76b0576e..000000000 --- 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,sur" diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc index f753e986f..69e804e4a 100755 --- a/kokoro/macos/prepare_build_macos_rc +++ b/kokoro/macos/prepare_build_macos_rc @@ -15,7 +15,7 @@ brew uninstall protobuf ## # 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,12 +25,6 @@ export CC=gcc 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 |