chore: install android dependencies

aws-amplify · Jul 15, 2023 · 2dd5a41 · 2dd5a41
1 parent 8c86150
commit 2dd5a41
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 12 deletions.
diff --git a/.codebuild/e2e_workflow.yml b/.codebuild/e2e_workflow.yml
@@ -28,6 +28,16 @@ batch:
         compute-type: BUILD_GENERAL1_MEDIUM
       depend-on:
         - build_linux
+    - identifier: build_app_android
+      buildspec: .codebuild/run_android_modelgen_e2e_test.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/build-app-android.test.ts
+          CLI_REGION: us-east-2
+      debug-session: true
+      depend-on:
+        - publish_to_local_registry
     # - identifier: build_app_swift
     #   buildspec: .codebuild/run_ios_modelgen_e2e_test.yml
     #   env:
@@ -112,16 +122,6 @@ batch:
     #       CLI_REGION: ap-southeast-2
     #   depend-on:
     #     - publish_to_local_registry
-    - identifier: build_app_android
-      buildspec: .codebuild/run_e2e_tests.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        variables:
-          TEST_SUITE: src/__tests__/build-app-android.test.ts
-          CLI_REGION: ap-northeast-1
-      debug-session: true
-      depend-on:
-        - publish_to_local_registry
     # - identifier: cleanup_e2e_resources
     #   buildspec: .codebuild/cleanup_e2e_resources.yml
     #   env:

diff --git a/.codebuild/run_android_modelgen_e2e_test.yml b/.codebuild/run_android_modelgen_e2e_test.yml
@@ -0,0 +1,33 @@
+version: 0.2
+env:
+  shell: bash
+  variables:
+    AMPLIFY_DIR: /root/.npm-global/lib/node_modules/@aws-amplify/cli-internal/bin
+    AMPLIFY_PATH: /root/.npm-global/lib/node_modules/@aws-amplify/cli-internal/bin/amplify
+    CI: true
+    CODEBUILD: true
+    NODE_OPTIONS: --max-old-space-size=8096
+
+phases:
+  install:
+    commands:
+      - sudo apt update
+      - yes | sudo apt install android-sdk
+      - export ANDROID_HOME=/usr/lib/android-sdk
+      - sudo apt install sdkmanager
+      - yes | sudo sdkmanager --licenses
+      - codebuild-breakpoint
+
+  build:
+    commands:
+      - source ./shared-scripts.sh && _runE2ETestsLinux
+      - codebuild-breakpoint
+  post_build:
+    commands:
+      - aws sts get-caller-identity
+      - source ./shared-scripts.sh && _scanArtifacts
+
+artifacts:
+  files:
+    - $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports/*
+  discard-paths: yes
diff --git a/packages/amplify-codegen-e2e-core/src/init/android.ts b/packages/amplify-codegen-e2e-core/src/init/android.ts
@@ -10,7 +10,7 @@ export function androidBuild(cwd: string, settings: Object = {}): Promise<void>
   return new Promise((resolve, reject) => {
     const s = { ...defaultSettings, ...settings };
 
-    const chain = spawn('gradle', ['build'], {
+    const chain = spawn('gradlew', ['build'], {
       cwd,
       stripColors: true,
       disableCIDetection: s.disableCIDetection,

diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts
@@ -39,7 +39,7 @@ describe('build app - Android', () => {
       const schemaText = `input AMPLIFY { globalAuthRule: AuthRule = { allow: public } }\n${schema.sdl}`;
       updateApiSchemaWithText(projectRoot, apiName, schemaText);
       await generateModels(projectRoot);
-      // await androidBuild(projectRoot, { ...config });
+      await androidBuild(projectRoot, { ...config });
     };
     if (skip.has(schemaName)) {
       it.skip(testName, testFunction);