last

.github/workflows/ci.yml

@@ -33,12 +33,11 @@ jobs:
         # Set up Android SDK
         wget -nv https://dl.google.com/android/repository/${{ env.COMMANDLINETOOLS_ZIP }}
         echo "${{ env.COMMANDLINETOOLS_SHA256 }}  ${{ env.COMMANDLINETOOLS_ZIP }}" | sha256sum -c -
-        mkdir android-sdk
-        unzip -q ${{ env.COMMANDLINETOOLS_ZIP }} -d android-sdk
-        # Set ANDROID_HOME environment variable
         ANDROID_HOME="${GITHUB_WORKSPACE}/android-sdk"
+        unzip -q ${{ env.COMMANDLINETOOLS_ZIP }} -d $ANDROID_HOME
+        # Set ANDROID_HOME environment variable
         echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
-        cd android-sdk/cmdline-tools/bin
+        cd ${ANDROID_HOME}/cmdline-tools/bin
         yes | ./sdkmanager --licenses --sdk_root=$ANDROID_HOME
         ./sdkmanager --update --sdk_root=$ANDROID_HOME
         ./sdkmanager --install "build-tools;34.0.0" --sdk_root=$ANDROID_HOME
@@ -90,9 +89,9 @@ jobs:
         Invoke-WebRequest -Uri "https://dl.google.com/android/repository/${{ env.COMMANDLINETOOLS_ZIP }}" -OutFile "${{ env.COMMANDLINETOOLS_ZIP }}"
         $hash = Get-FileHash "${{ env.COMMANDLINETOOLS_ZIP }}" -Algorithm SHA256
         if ($hash.Hash -ne "${{ env.COMMANDLINETOOLS_SHA256 }}") { throw "SHA256 mismatch for ${{ env.COMMANDLINETOOLS_ZIP }}" }
-        Expand-Archive -Path "${{ env.COMMANDLINETOOLS_ZIP }}" -DestinationPath "android-sdk"
-        # Set ANDROID_HOME environment variable
         $ANDROID_HOME = "${{ github.workspace }}\android-sdk"
+        Expand-Archive -Path "${{ env.COMMANDLINETOOLS_ZIP }}" -DestinationPath $ANDROID_HOME
+        # Set ANDROID_HOME environment variable
         echo "ANDROID_HOME=$ANDROID_HOME" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         Set-Location $ANDROID_HOME\cmdline-tools\bin
         $licenses = @("y", "y", "y", "y", "y", "y", "y", "y")