From 0837a6f9d664c07d46d8a838ea75601675ca77d2 Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Thu, 2 Dec 2021 15:17:44 -0800
Subject: [PATCH] Also set Xcode version explicitly in Android workflow.

---
 .github/workflows/android.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index f0b3bf8c71..31972cf325 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -13,6 +13,7 @@ on:
 env:
   CCACHE_DIR: ${{ github.workspace }}/ccache_dir
   GITHUB_TOKEN: ${{ github.token }}
+  xcodeVersion: "12.4"  # Only affects Mac runners, and only for prerequisites.
 
 jobs:
   prepare_matrix:
@@ -46,6 +47,10 @@ jobs:
         architecture: ${{ fromJson(needs.prepare_matrix.outputs.matrix_architecture) }}
         python_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version) }}
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - name: Store git credentials for all git commands
         # Forces all git commands to use authenticated https, to prevent throttling.
         shell: bash