Skip to content

fix: remove dup licenses acceptance #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 12, 2025
Merged

fix: remove dup licenses acceptance #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afe0838
fix: remove dup licenses acceptance
Siqi-Shan Feb 11, 2025
beefc4d
chore: add comments to clarify command behaviors
Siqi-Shan Feb 11, 2025
2ce6bbb
chore: add comment
Siqi-Shan Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .codebuild/run_android_modelgen_e2e_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ phases:
- yes | sudo apt install android-sdk
- export ANDROID_HOME=/usr/lib/android-sdk
- yes | sudo apt install sdkmanager
# Review SDK licenses
- yes | sudo sdkmanager --licenses
# Licenses acceptance is needed for Android project build.
# "sdkmanager --licenses" is handled in test beforeAll setup,
# and this ensures the project accepts all licenses needed.

build:
commands:
Expand Down
5 changes: 3 additions & 2 deletions .codebuild/run_canary_android_modelgen_e2e_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ phases:
- yes | sudo apt install android-sdk
- export ANDROID_HOME=/usr/lib/android-sdk
- yes | sudo apt install sdkmanager
# Review SDK licenses
- yes | sudo sdkmanager --licenses
# Licenses acceptance is needed for Android project build.
# "sdkmanager --licenses" is handled in test beforeAll setup,
# and this ensures the project accepts all licenses needed.

build:
commands:
Expand Down
2 changes: 2 additions & 0 deletions packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ describe('build app - Android', () => {
await addCodegen(projectRoot, {
frontendType: AmplifyFrontend.android,
});

// Required to accept all licenses needed per this test project build
await acceptLicenses(projectRoot);
});

Expand Down
Loading