Revert matrix.

ReactiveCircus · Oct 10, 2024 · 7e1c968 · 7e1c968
1 parent 71822f9
commit 7e1c968
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,26 +23,22 @@ jobs:
             api-level: 23
             target: default
             arch: x86
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
             api-level: 24
             target: playstore
             arch: x86
           - os: macos-13
             api-level: 31
             target: default
             arch: x86_64
-          - os: ubuntu-22.04
+          - os: ubuntu-latest
             api-level: 34
             target: aosp_atd
             arch: x86_64
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             api-level: 35
             target: google_apis
             arch: x86_64
-          - os: ubuntu-latest
-            api-level: 29
-            target: default
-            arch: x86
 
     steps:
     - name: checkout
@@ -97,7 +93,7 @@ jobs:
         emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         disable-animations: false
         working-directory: ./test-fixture/
-        channel: stable
+        channel: canary
         script: echo "Generated AVD snapshot for caching."
 
     - name: run action
@@ -115,7 +111,7 @@ jobs:
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         disable-animations: true
         working-directory: ./test-fixture/
-        channel: stable
+        channel: canary
         pre-emulator-launch-script: |
           echo "Running pre emulator launch script. Printing the working directory now:"
           pwd

diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
@@ -52,9 +52,6 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
             console.log(`::group::Install Android SDK`);
             const isOnMac = process.platform === 'darwin';
             const isArm = process.arch === 'arm64';
-            // if (!isOnMac) {
-            //   await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`);
-            // }
             const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`;
             if (!fs.existsSync(cmdlineToolsPath)) {
                 console.log('Installing new cmdline-tools.');

diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
@@ -19,10 +19,6 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch:
     const isOnMac = process.platform === 'darwin';
     const isArm = process.arch === 'arm64';
 
-    // if (!isOnMac) {
-    //   await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`);
-    // }
-
     const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`;
     if (!fs.existsSync(cmdlineToolsPath)) {
       console.log('Installing new cmdline-tools.');