From 730757f124ea27b8ace1331dbe5819563e5548c6 Mon Sep 17 00:00:00 2001
From: Yang Chen <ychescale9@gmail.com>
Date: Wed, 1 Apr 2020 09:37:55 +1100
Subject: [PATCH 1/4] Remove API 28 from workflow.

---
 .github/workflows/workflow.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 029f8092d..2a92fc8d8 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -14,14 +14,12 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-        api-level: [16, 23, 28, 29]
+        api-level: [16, 23, 29]
         exclude:
           - os: ubuntu-latest
             api-level: 23
           - os: ubuntu-latest
             api-level: 29
-          - os: macos-latest
-            api-level: 28
     steps:
     - name: checkout
       uses: actions/checkout@v2

From 0d53ec8e439f4a8a835c69feeeb086e56a1ceb6c Mon Sep 17 00:00:00 2001
From: Yang Chen <ychescale9@gmail.com>
Date: Thu, 2 Apr 2020 22:56:56 +1100
Subject: [PATCH 2/4] Use correct cli-tools binary for mac.

---
 lib/sdk-installer.js | 2 +-
 src/sdk-installer.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
index e8fb3ab4a..9a96b13fd 100644
--- a/lib/sdk-installer.js
+++ b/lib/sdk-installer.js
@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const exec = __importStar(require("@actions/exec"));
 const BUILD_TOOLS_VERSION = '29.0.3';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
 const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
 /**
  * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
index fa7c69a58..3833de013 100644
--- a/src/sdk-installer.ts
+++ b/src/sdk-installer.ts
@@ -2,7 +2,7 @@ import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 
 const BUILD_TOOLS_VERSION = '29.0.3';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
 const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
 
 /**

From 8c62a78107423d660e7cd1b6341d2e6bbd27216a Mon Sep 17 00:00:00 2001
From: Yang Chen <ychescale9@gmail.com>
Date: Thu, 2 Apr 2020 23:43:06 +1100
Subject: [PATCH 3/4] Add gradle caching.

---
 .github/workflows/workflow.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 2a92fc8d8..5e6bb0c0a 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -38,7 +38,13 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 14
-
+    - name: Clean cache
+      if: matrix.os == 'macos-latest'
+      run: mv ~/.gradle/caches ~/.gradle/.invalid_caches
+    - uses: actions/cache@v1
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
     - name: run action
       uses: ./
       with:

From 61dd774a5b2ad006fe0b6fc53f53086afc241653 Mon Sep 17 00:00:00 2001
From: Yang Chen <ychescale9@gmail.com>
Date: Fri, 3 Apr 2020 00:12:04 +1100
Subject: [PATCH 4/4] Prepare for release 2.6.2.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35193d9e9..8d483db50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.6.2
+
+* Fixed an issue where the Linux command-line tools binary is used for `macos`.
+
 ## v2.6.1
 
 * Fixed SDK license issue on Linux when downloading API 28+ system images - [#42](https://github.com/ReactiveCircus/android-emulator-runner/issues/42).