From 17a99b11d0237af771ceaf0770c8f706fb11a487 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jul 2025 05:55:02 +0000 Subject: [PATCH 1/7] Bump org.springframework.boot:spring-boot-gradle-plugin Bumps [org.springframework.boot:spring-boot-gradle-plugin](https://github.com/spring-projects/spring-boot) from 3.4.1 to 3.5.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.1...v3.5.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-gradle-plugin dependency-version: 3.5.4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- server/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build.gradle b/server/build.gradle index ec09ad5b..9e7286d6 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'io.spring.gradle:dependency-management-plugin:1.1.7' - classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.4.1' + classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.5.4' } } From 6cc128df2c472641fd22b4660a3bf411396af221 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jul 2025 06:00:36 +0000 Subject: [PATCH 2/7] Bump org.springframework.boot from 3.3.5 to 3.5.4 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.3.5 to 3.5.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.5.4) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-version: 3.5.4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- server/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build.gradle b/server/build.gradle index 9e7286d6..91a7f2ff 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -14,7 +14,7 @@ buildscript { plugins { id 'java' id 'idea' - id 'org.springframework.boot' version '3.3.5' + id 'org.springframework.boot' version '3.5.4' id 'jacoco' } From 776a4d9ecb8ba71d6c1dcb459dafde7314b345e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 13:54:55 +0000 Subject: [PATCH 3/7] Bump org.junit.jupiter:junit-jupiter-engine from 5.11.4 to 5.13.4 Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit-framework) from 5.11.4 to 5.13.4. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.11.4...r5.13.4) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 5.13.4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/build.gradle | 4 ++-- server/manifestmergetool/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/build.gradle b/client/build.gradle index f8179e3a..4778b9c6 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -39,8 +39,8 @@ dependencies { } testImplementation('commons-io:commons-io:2.18.0') testImplementation("org.mockito:mockito-core:5.+") - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.11.4') - testImplementation('org.junit.jupiter:junit-jupiter-params:5.11.4') + testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.4') + testImplementation('org.junit.jupiter:junit-jupiter-params:5.13.4') testImplementation('org.apache.james:apache-mime4j:0.8.13') } diff --git a/server/manifestmergetool/build.gradle b/server/manifestmergetool/build.gradle index dd218dd3..a162e995 100644 --- a/server/manifestmergetool/build.gradle +++ b/server/manifestmergetool/build.gradle @@ -81,7 +81,7 @@ dependencies { implementation('commons-codec:commons-codec:1.18.0') testImplementation('commons-io:commons-io:2.18.0') - testImplementation('org.junit.jupiter:junit-jupiter-engine:5.11.4') + testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.4') } allprojects { From 2846c4eb3d8859e8d5a529babb2eb7cb3d86b394 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 06:34:43 +0000 Subject: [PATCH 4/7] Bump io.micrometer:micrometer-registry-influx from 1.14.3 to 1.15.3 Bumps [io.micrometer:micrometer-registry-influx](https://github.com/micrometer-metrics/micrometer) from 1.14.3 to 1.15.3. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.14.3...v1.15.3) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-registry-influx dependency-version: 1.15.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- server/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index 91a7f2ff..c37a960b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -72,7 +72,7 @@ dependencies { implementation('org.springframework.boot:spring-boot-starter-actuator') implementation('org.springframework.boot:spring-boot-starter-jetty') implementation('org.springframework.boot:spring-boot-starter-security') - implementation('io.micrometer:micrometer-core:1.14.3') + implementation('io.micrometer:micrometer-core:1.15.3') implementation('io.micrometer:micrometer-tracing:1.4.1') implementation('io.micrometer:micrometer-tracing-bridge-otel:1.4.1') @@ -80,8 +80,8 @@ dependencies { annotationProcessor('org.projectlombok:lombok:1.18.36') runtimeOnly('net.logstash.logback:logstash-logback-encoder:8.0') - runtimeOnly('io.micrometer:micrometer-registry-influx:1.14.3') - runtimeOnly('io.micrometer:micrometer-registry-prometheus:1.14.3') { + runtimeOnly('io.micrometer:micrometer-registry-influx:1.15.3') + runtimeOnly('io.micrometer:micrometer-registry-prometheus:1.15.3') { exclude group: 'org.junit.jupiter' } From 7f31d4cfc4809f37b601c1d1dfffd66f9d71919c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 06:44:54 +0000 Subject: [PATCH 5/7] Bump io.micrometer:micrometer-tracing-bridge-otel from 1.4.1 to 1.5.3 Bumps [io.micrometer:micrometer-tracing-bridge-otel](https://github.com/micrometer-metrics/tracing) from 1.4.1 to 1.5.3. - [Release notes](https://github.com/micrometer-metrics/tracing/releases) - [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.4.1...v1.5.3) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-tracing-bridge-otel dependency-version: 1.5.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- server/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index c37a960b..918a407b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -73,8 +73,8 @@ dependencies { implementation('org.springframework.boot:spring-boot-starter-jetty') implementation('org.springframework.boot:spring-boot-starter-security') implementation('io.micrometer:micrometer-core:1.15.3') - implementation('io.micrometer:micrometer-tracing:1.4.1') - implementation('io.micrometer:micrometer-tracing-bridge-otel:1.4.1') + implementation('io.micrometer:micrometer-tracing:1.5.3') + implementation('io.micrometer:micrometer-tracing-bridge-otel:1.5.3') implementation('org.projectlombok:lombok:1.18.36') annotationProcessor('org.projectlombok:lombok:1.18.36') From 47a54a6f93940ee3413c31d4b59fc95973c5620e Mon Sep 17 00:00:00 2001 From: Kharkunov Eugene Date: Thu, 21 Aug 2025 20:54:43 +0300 Subject: [PATCH 6/7] Update dependencies --- server/build.gradle | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index 918a407b..0bfa9a46 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -42,10 +42,8 @@ repositories { dependencyManagement { imports { - // DO NOT update higher 5.8.0 because transitive dependencies has opentelemtry version 1.45.0+ - // which has breaking changes in comparison with 1.43.0 - mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:5.8.0' - mavenBom 'org.junit:junit-bom:5.11.4' + mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:7.1.0' + mavenBom 'org.junit:junit-bom:5.13.4' } } @@ -60,13 +58,14 @@ dependencies { implementation('com.google.cloud:spring-cloud-gcp-starter-storage') implementation('com.google.cloud:spring-cloud-gcp-starter-logging') - implementation('com.google.cloud:google-cloud-compute:1.67.0') + implementation('com.google.cloud:google-cloud-compute:1.82.0') implementation('com.samskivert:jmustache:1.16') implementation('commons-chain:commons-chain:1.2') implementation('org.apache.commons:commons-fileupload2-jakarta:2.0.0-M1') - implementation('org.apache.commons:commons-text:1.13.+') - implementation('org.apache.commons:commons-compress:1.27.+') - implementation('org.apache.commons:commons-lang3:3.17.0') + implementation('org.apache.commons:commons-fileupload2-core:2.0.0-M4') + implementation('org.apache.commons:commons-text:1.14.0') + implementation('org.apache.commons:commons-compress:1.28.0') + implementation('org.apache.commons:commons-lang3:3.18.0') implementation('org.apache.httpcomponents:httpclient:4.5.14') implementation('org.apache.httpcomponents:httpmime:4.5.14') implementation('org.springframework.boot:spring-boot-starter-actuator') @@ -79,7 +78,7 @@ dependencies { implementation('org.projectlombok:lombok:1.18.36') annotationProcessor('org.projectlombok:lombok:1.18.36') - runtimeOnly('net.logstash.logback:logstash-logback-encoder:8.0') + runtimeOnly('net.logstash.logback:logstash-logback-encoder:8.1') runtimeOnly('io.micrometer:micrometer-registry-influx:1.15.3') runtimeOnly('io.micrometer:micrometer-registry-prometheus:1.15.3') { exclude group: 'org.junit.jupiter' From 6c7f2c810aed17e7ab81f84c7bc4ce115b2b1d54 Mon Sep 17 00:00:00 2001 From: Kharkunov Eugene Date: Sun, 24 Aug 2025 14:58:38 +0300 Subject: [PATCH 7/7] Update tests --- server/README.md | 3 +++ server/configs/application-test-app.yml | 6 +++--- .../com/defold/extender/IntegrationTest.java | 20 +++++++++---------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/server/README.md b/server/README.md index c7d529b9..26f46863 100644 --- a/server/README.md +++ b/server/README.md @@ -195,3 +195,6 @@ Keys in `extender.remote-builder.platform` should be formed in the following way 3. Frontend instance looks into `platform.sdks.json` for information according to requested platform. For example, user try to build engine for platform `js-web`. In that case frontend instance found `["emsdk", "3155"]`. 4. Frontend instance search through `extender.remote-builder.platforms` using the keys: `-` and `-latest`. If no mappings was found - frontend instance starts local build (which highly likely will fail because no appropriate environment was configured). For our example frontend instance search for `emsdk-3155` and `emsdk-latest`. 5. Frontend instance sends a build request to the found server url. + +# Testing notes +When runs integration tests on Macos at arm chips - check docker engine configuration. It's better to use `Virtual Machine option` -> `Apple Virtualization framework` with checked `Use Rosetta for x86_64/amd64 emulation on Apple Silicon` checkbox. \ No newline at end of file diff --git a/server/configs/application-test-app.yml b/server/configs/application-test-app.yml index e43a4cae..a79d38e6 100644 --- a/server/configs/application-test-app.yml +++ b/server/configs/application-test-app.yml @@ -6,12 +6,12 @@ extender: url: http://android-ndk25:9000 instanceId: android-ndk25 alwaysOn: true - emsdk-3155: - url: http://emsdk-3155:9000 - instanceId: emsdk-3155 emsdk-3165: url: http://emsdk-3165:9000 instanceId: emsdk-3165 + emsdk-406: + url: http://emsdk-406:9000 + instanceId: emsdk-406 linux-latest: url: http://linux:9000 instanceId: linux diff --git a/server/src/test/java/com/defold/extender/IntegrationTest.java b/server/src/test/java/com/defold/extender/IntegrationTest.java index e1cf49d7..7e1d8330 100644 --- a/server/src/test/java/com/defold/extender/IntegrationTest.java +++ b/server/src/test/java/com/defold/extender/IntegrationTest.java @@ -113,17 +113,17 @@ public static List data() { // "a" is a made up sdk where we can more easily test build.yml fixes // new DefoldVersion("a", new Version(0, 0, 0), new String[] {"armv7-android", "x86_64-win32"} ), - // // 2024-12-05 https://github.com/defold/defold/releases/tag/1.9.5 - new DefoldVersion("d01194cf0fb576b516a1dca6af6f643e9e590051", new Version(1, 9, 5), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), - // // 2024-12-19 https://github.com/defold/defold/releases/tag/1.9.6 - new DefoldVersion("11d2cd3a9be17b2fc5a2cb5cea59bbfb4af1ca96", new Version(1, 9, 6), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), - // // 2025-02-12 https://github.com/defold/defold/releases/tag/1.9.7 - new DefoldVersion("868769ba7a3458db12d149188bf3be80a339a85c", new Version(1, 9, 7), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), - // // 2025-03-11 https://github.com/defold/defold/releases/tag/1.9.8 - new DefoldVersion("67542769598a1b794877c96f740f3f527f63f491", new Version(1, 9, 8), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), // // 2025-04-14 https://github.com/defold/defold/releases/tag/1.10.0 new DefoldVersion("591eb496d52f4140bc2c7de547131f1b9408b9b4", new Version(1, 10, 0), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), + // // 2024-05-14 https://github.com/defold/defold/releases/tag/1.10.1 + new DefoldVersion("d8e6e73a8efac6b9a72783027867e547b6a363e4", new Version(1, 10, 1), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), + // // 2024-06-11 https://github.com/defold/defold/releases/tag/1.10.2 + new DefoldVersion("7a0e23b3fcab4c5db82f2b32f5d8ac5df9467c9d", new Version(1, 10, 2), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), + // // 2025-07-07 https://github.com/defold/defold/releases/tag/1.10.3 + new DefoldVersion("1c76521bb8b08c63ef619aa8a5ab563dddf7b3cf", new Version(1, 10, 3), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), + // // 2025-08-04 https://github.com/defold/defold/releases/tag/1.10.4 + new DefoldVersion("1aafd0a262ff40214ed7f51302d92fa587c607ef", new Version(1, 10, 4), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}), // Use test-data/createdebugsdk.sh to package your preferred platform sdk and it ends up in the sdk/debugsdk folder // Then you can write your tests without waiting for the next release //new DefoldVersion("debugsdk", new Version(1, 2, 104), new String[] {"js-web"}), @@ -455,8 +455,8 @@ public void buildAndroidJarWithMetaInf(TestConfiguration configuration) throws I } } } - String[] expected = {"META-INF/inner.folder/com.inner", "META-INF/inner.folder/io.foo.service.HTTPClient"}; - assertArrayEquals(expected, metaInfFiles.toArray()); + List expected = List.of("META-INF/inner.folder/com.inner", "META-INF/inner.folder/io.foo.service.HTTPClient"); + assertTrue(expected.containsAll(metaInfFiles) && metaInfFiles.containsAll(expected)); } @ParameterizedTest(name = "[{index}] {displayName} {arguments}")