From 9c3b051bdd00b6488f5be54c0c8baf099f7139c3 Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Fri, 5 Jul 2024 12:59:48 +0200
Subject: [PATCH] again

---
 .github/workflows/android_main.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml
index 76cddbaa1a3d..667b92048864 100644
--- a/.github/workflows/android_main.yml
+++ b/.github/workflows/android_main.yml
@@ -38,13 +38,12 @@ jobs:
         distribution: 'zulu'
         java-version: 17
 
-    - name: setup python 3.10
+    - name: setup python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: "3.10"
-
-    - name: pip install conan
-      run: python -m pip install conan
+        python-version: 3.12
+    - name: install python dependencies
+      run: pip install conan
 
     - name: install ndk
       run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
@@ -107,20 +106,19 @@ jobs:
 
     - name: install brew
       run: ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null
-    - name: fix ninja install
-      run: rm /usr/local/bin/2to3
     - name: install ninja
       run: brew install ninja
-    # https://stackoverflow.com/a/57758679/198996
     - name: install bundler
-      run: gem install bundler:1.17.3
+      run: gem install bundler
     - name: install fastlane
       run: bundle install
 
-    - name: install pip
-      run: python3 -m ensurepip
-    - name: install conan
-      run: pip3 install --upgrade conan
+    - name: setup python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.12
+    - name: install python dependencies
+      run: pip install conan
 
     - name: conan remote
       run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan