Skip to content

Commit

Permalink
Android CI fix (#690)
Browse files Browse the repository at this point in the history
  • Loading branch information
sbSteveK committed Oct 5, 2023
1 parent f886656 commit c92b4f1
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
20 changes: 20 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,26 @@ jobs:
- name: Build ${{ env.PACKAGE_NAME }}
run: |
./gradlew :android:crt:build
./gradlew -PnewVersion="1.0.0-SNAPSHOT" :android:crt:publishToMavenLocal
# Setup files required by test app for Device Farm testing
- name: Setup Android Test Files
run: |
cd src/test/android/testapp/src/main/assets
python3 -m pip install boto3
python3 ./android_file_creation.py
- name: Build Test App
run: |
cd src/test/android/testapp
../../../../gradlew assembledebug
../../../../gradlew assembleAndroidTest
- name: Device Farm Tests
run: |
echo "Running Device Farm Python Script"
python3 ./.github/workflows/run_android_ci.py \
--run_id ${{ github.run_id }} \
--run_attempt ${{ github.run_attempt }} \
--project_arn $(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/DeviceFarm/ProjectArn" --query "SecretString" | cut -f5 -d\" | cut -f1 -d'\') \
--device_pool_arn $(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/DeviceFarm/DevicePoolArn" --query "SecretString" | cut -f5 -d\" | cut -f1 -d'\')
# check that docs can still build
check-docs:
Expand Down
3 changes: 2 additions & 1 deletion android/crt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ afterEvaluate {

groupId = 'software.amazon.awssdk.crt'
artifactId = 'aws-crt-android'
version = project.hasProperty('newVersion') ? project.property('newVersion') : android.defaultConfig.versionName

pom {
name.set("software.amazon.awssdk.crt:aws-crt-android")
description.set("Java Android bindings for the AWS SDK Common Runtime")
Expand All @@ -199,7 +201,6 @@ afterEvaluate {
url.set("https://github.com/awslabs/aws-crt-java")
}
}
version = android.defaultConfig.versionName
}
}

Expand Down
Empty file modified codebuild/cd/deploy-platform-specific-jars.sh
100755 → 100644
Empty file.

0 comments on commit c92b4f1

Please sign in to comment.