From 588caab074c495c685136ea66f002abc649ecb67 Mon Sep 17 00:00:00 2001
From: Robin Westberg <rwestberg@openjdk.org>
Date: Mon, 16 Nov 2020 08:00:21 +0000
Subject: [PATCH] 8256277: Github Action build on macOS should define OS and
 Xcode versions

Reviewed-by: shade, ehelin, erikj
---
 .github/workflows/submit.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index f488a9b2b5a..b5cef57e4a6 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -1543,7 +1543,7 @@ jobs:
 
   macos_x64_build:
     name: macOS x64
-    runs-on: "macos-latest"
+    runs-on: "macos-10.15"
     needs: prerequisites
     if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_macos_x64 != 'false'
 
@@ -1613,6 +1613,9 @@ jobs:
       - name: Install dependencies
         run: brew install make
 
+      - name: Select Xcode version
+        run: sudo xcode-select --switch /Applications/Xcode_11.3.1.app/Contents/Developer
+
       - name: Configure
         run: >
           bash configure
@@ -1643,7 +1646,7 @@ jobs:
 
   macos_x64_test:
     name: macOS x64
-    runs-on: "macos-latest"
+    runs-on: "macos-10.15"
     needs:
       - prerequisites
       - macos_x64_build
@@ -1756,6 +1759,9 @@ jobs:
       - name: Install dependencies
         run: brew install make
 
+      - name: Select Xcode version
+        run: sudo xcode-select --switch /Applications/Xcode_11.3.1.app/Contents/Developer
+
       - name: Find root of jdk image dir
         run: |
           imageroot=`find ${HOME}/jdk-macos-x64${{ matrix.artifact }}/jdk-${{ env.JDK_VERSION }}-internal+0_osx-x64_bin${{ matrix.artifact }} -name release -type f`