From 722b146948ca102550af67855b00c535588c83b6 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Sun, 24 Dec 2023 22:40:42 +0530
Subject: [PATCH] ci update

---
 .circleci/config.yml | 61 ++++++++++++--------------------------------
 1 file changed, 16 insertions(+), 45 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 87b98d4c..e4479a2b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,6 +10,7 @@ jobs:
     executor: 
         name: android/android-machine
         shell: bash.exe # executor type
+        tag: 2021.10.1
     # Checkout the code as the first step. This is a dedicated CircleCI step.
     # The python orb's install-packages step will install the dependencies from a Pipfile via Pipenv by default.
     # Here we're making sure we use just use the system-wide pip. By default it uses the project root's requirements.txt.
@@ -20,68 +21,38 @@ jobs:
             fingerprints:
                 - "82:42:56:a0:57:43:95:4e:00:c0:8c:c1:7f:70:74:47"
   
-        - checkout
+        - checkout:
+            path: ~/MBHaxe
         - run:
             name: Install dependencies
             command: |
-              curl -fsSL --retry 3 --retry-delay 5 -o /tmp/sdl.zip https://www.libsdl.org/release/SDL2-devel-2.0.5-VC.zip
-              curl -fsSL --retry 3 --retry-delay 5 -o /tmp/openal.zip https://openal-soft.org/openal-binaries/openal-soft-1.17.2-bin.zip
-              curl -fsSL --retry 3 --retry-delay 5 -o /tmp/ffmpeg.zip https://github.com/HaxeFoundation/hashlink/files/5648056/ffmpeg-3.4.2-win64-dev.zip
-              cd /tmp
-              7z x /tmp/sdl.zip    -oinclude; mv /tmp/include/SDL2*   /tmp/include/sdl
-              7z x /tmp/openal.zip -oinclude; mv /tmp/include/openal* /tmp/include/openal
-              7z x /tmp/ffmpeg.zip -oinclude; mv /tmp/include/ffmpeg* /tmp/include/ffmpeg
+              set -eux
+              download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.3.3/haxe-4.3.3-linux64.tar.gz"
+              echo "Downloading [$download_url]..."
+              mkdir /tmp/haxe
+              curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.tar.gz
+              tar xzvf /tmp/haxe.tar.gz -C /tmp/haxe --strip-components=1
+              export PATH=/tmp/haxe/:"$PATH"
+              export HAXE_STD_PATH=/tmp/haxe/std
+              haxelib setup ~/haxelib
+              haxelib list
         - android/install-ndk: 
             version: 18.1.5063045
-        - run:
-            name: Install Neko
-            command: |
-              choco install --no-progress neko -y
-              nekopath=$(/bin/find /c/ProgramData/chocolatey/lib/neko -name neko.dll -printf '%h\n')
-              set NEKOPATH=$nekopath
-              export PATH=$nekopath:"$PATH"
-        - run:
-            name: Install Haxe
-            command: |
-              download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-win64.zip"
-              echo "Downloading [$download_url]..."
-              mkdir /tmp/haxe
-              curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.zip
-              7z x /tmp/haxe.zip -o/tmp
-              mv -v /tmp/haxe_* /tmp/haxe
-              cd /tmp/haxe
-              mv haxe_* haxe
-              export PATH=/tmp/haxe/haxe:"$PATH"
-              export HAXE_STD_PATH=/tmp/haxe/haxe/std
-              nekopath=$(/bin/find /c/ProgramData/chocolatey/lib/neko -name neko.dll -printf '%h\n')
-              set NEKOPATH=$nekopath
-              export PATH=$nekopath:"$PATH"
-              haxelib setup ~/haxelib
-              haxelib list
         - run:
             name: Install haxe dependencies
             command: |
-              export PATH=/tmp/haxe/haxe:"$PATH"
-              export HAXE_STD_PATH=/tmp/haxe/haxe/std
-              nekopath=$(/bin/find /c/ProgramData/chocolatey/lib/neko -name neko.dll -printf '%h\n')
-              set NEKOPATH=$nekopath
-              export PATH=$nekopath:"$PATH"
+              export PATH=/tmp/haxe/:"$PATH"
+              export HAXE_STD_PATH=/tmp/haxe/std
               haxelib git heaps https://github.com/RandomityGuy/heaps
               haxelib dev hlopenal ~/deps/hashlink/libs/openal
               haxelib dev hlsdl ~/deps/hashlink/libs/sdl
-              haxelib dev hashlink ~/deps/hashlink/other/haxelib
         - run:
             name: Compile MBHaxe
             command: |
               export PATH=/tmp/haxe/haxe:"$PATH"
               export HAXE_STD_PATH=/tmp/haxe/haxe/std
-              nekopath=$(/bin/find /c/ProgramData/chocolatey/lib/neko -name neko.dll -printf '%h\n')
-              set NEKOPATH=$nekopath
-              export PATH=$nekopath:"$PATH"
-              cd ~/project
+              cd ~/MBHaxe
               git clone https://github.com/RandomityGuy/MBHaxeAndroidLibs
-              haxe compile-c.hxml
-              cd native
 
 
 # Invoke jobs via workflows