Skip to content

Implemented instance type #712

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.

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

Draft
wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Updated configs
  • Loading branch information
ekharkunov committed Apr 24, 2025
commit 93a3cf4c41aad93ee32a6663331c0fa5872199c3
5 changes: 0 additions & 5 deletions server/configs/application-dev.yml

This file was deleted.

5 changes: 4 additions & 1 deletion server/configs/application-local-dev-android.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
extender.gradle.enabled: true
extender:
instance-type: BUILDER_ONLY
gradle:
enabled: true
1 change: 1 addition & 0 deletions server/configs/application-local-dev-app.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
extender:
instance-type: FRONTEND_ONLY
remote-builder:
enabled: true
platforms:
Expand Down
1 change: 1 addition & 0 deletions server/configs/application-local-dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
extender:
instance-type: BUILDER_ONLY
# sdk.location: /usr/local/extender/sdk
cache:
enabled: true
Expand Down
1 change: 1 addition & 0 deletions server/configs/application-standalone-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ server:
port: 9010

extender:
instance-type: MIXED
sdk:
location: /usr/local/extender/sdk
cache-clear-on-exit: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ public void buildEngineAsync(HttpServletRequest _request,
} else {
String[] buildEnvDescription = null;
try {
// sdk version was removed (dev or beta)
buildEnvDescription = ExtenderUtil.getSdksForPlatform(platform, defoldSdkService.getPlatformSdkMappings(sdkVersion));
} catch(ExtenderException exc) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exception happened if we can't find sdk mappings for given hash.

if (instanceType.equals(InstanceType.FRONTEND_ONLY)) {
Expand All @@ -226,6 +227,7 @@ public void buildEngineAsync(HttpServletRequest _request,
} else if (instanceType.equals(InstanceType.MIXED)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If sdk mappings exist but there are no required sdk version defined and instance marked as "MIXED" - try build on current instance.

asyncBuilder.asyncBuildEngine(metricsWriter, platform, sdkVersion, jobDirectory, uploadDirectory, buildDirectory);
} else {
// no remote buidler was found and current instance can't build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buidler -> builder

throw new NotSupportedException("Engine version unsupported. Please, update engine to the newer version.");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SDK mappings exists but no record for given sdk and version was found - throw error.

}
}
Expand Down