From 7a7b44f713be905f7a895daf800f5415af8bfb4d Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 5 Jan 2021 11:55:02 -0800
Subject: [PATCH] Update CI script

---
 .github/workflows/main.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e7041806..c1df87a34 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,6 @@ jobs:
       if: ${{ !startsWith(matrix.os, 'windows-') }}
       run: |
         echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
-        echo "ANDROID_NDK_ROOT=~/android-ndk-r15c" >> $GITHUB_ENV
 
     - name: Set environment variables (Windows)
       if: ${{ startsWith(matrix.os, 'windows-') }}
@@ -66,15 +65,14 @@ jobs:
     - name: Configure Android support (Linux)
       if: ${{ startsWith(matrix.os, 'ubuntu-') }}
       run: |
-        mkdir -p $ANDROID_NDK_ROOT
         wget -O android-ndk.zip --quiet https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip
-        unzip -qq android-ndk.zip -d $ANDROID_NDK_ROOT/..
+        unzip -qq android-ndk.zip
         rm android-ndk.zip
         lime config ANDROID_SDK $ANDROID_HOME
-        haxelib run lime config ANDROID_NDK_ROOT $ANDROID_NDK_ROOT
-        haxelib run lime config JAVA_HOME $JAVA_HOME
-        haxelib run lime config ANDROID_SETUP true
-        haxelib run lime config
+        lime config ANDROID_NDK_ROOT android-ndk-r15c
+        lime config JAVA_HOME $JAVA_HOME
+        lime config ANDROID_SETUP true
+        lime config
 
     - name: Rebuild Lime tools
       run: |