Update to Mendix 10.11 and enable mxbuild multi-arch (#1127)

automation/run-e2e/docker/m2ee.yml

@@ -6,7 +6,7 @@ m2ee:
   admin_pass: Password1!
   runtime_port: 8080
   runtime_listen_addresses: "*"
-  javaopts: ["-Dfile.encoding=UTF-8", "-XX:MaxPermSize=128M", "-Xmx512M", "-Xms512M", "-Djava.io.tmpdir=/source/tests/testProject/deployment/data/tmp"]
+  javaopts: ["-Dfile.encoding=UTF-8", "-Xmx512M", "-Xms512M", "-Djava.io.tmpdir=/source/tests/testProject/deployment/data/tmp"]
   javabin: /usr/bin/java
   pidfile: /var/run/m2ee.pid
 mxruntime:

automation/run-e2e/docker/mxbuild.Dockerfile

@@ -1,28 +1,38 @@
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM --platform=$BUILDPLATFORM eclipse-temurin:17-jdk-jammy
+
 ARG MENDIX_VERSION
+ARG BUILDPLATFORM
 
+SHELL ["/bin/bash", "-c"]
 RUN \
-    echo "Installing Java..." && \
-    apt-get -qq update && \
-    apt-get -qq install -y wget libgdiplus && \
-    wget -q https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz -O /tmp/openjdk.tar.gz && \
-    mkdir /usr/lib/jvm && \
-    tar xfz /tmp/openjdk.tar.gz --directory /usr/lib/jvm && \
-    rm /tmp/openjdk.tar.gz && \
-\
-    echo "Downloading mxbuild ${MENDIX_VERSION}..." && \
-    wget -q https://cdn.mendix.com/runtime/net6-mxbuild-${MENDIX_VERSION}.tar.gz -O /tmp/mxbuild.tar.gz && \
-    mkdir /tmp/mxbuild && \
-    tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild && \
-    rm /tmp/mxbuild.tar.gz && \
+echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATFORM}..." \
+    && case "${BUILDPLATFORM}" in \
+        linux/arm64) \
+            BINARY_URL="https://cdn.mendix.com/runtime/arm64-mxbuild-${MENDIX_VERSION}.tar.gz"; \
+            ;; \
+        linux/amd64) \
+            BINARY_URL="https://cdn.mendix.com/runtime/mxbuild-${MENDIX_VERSION}.tar.gz"; \
+            ;; \
+        *) \
+            echo "Unsupported architecture: ${BUILDPLATFORM}" >&2; \
+            exit 1; \
+            ;; \
+    esac \
+    && echo "Downloading from: ${BINARY_URL}" \
+    && wget -q "${BINARY_URL}" -O /tmp/mxbuild.tar.gz \
+    && mkdir /tmp/mxbuild \
+    && tar xfz /tmp/mxbuild.tar.gz --directory /tmp/mxbuild \
+    && rm /tmp/mxbuild.tar.gz && \
 \
-    apt-get -qq remove -y wget && \
+    apt-get update -qqy && \
+    apt-get install -qqy libicu70 && \
+    apt-get -qqy remove --auto-remove wget && \
     apt-get clean && \
 \
     echo "#!/bin/bash -x" >/bin/mxbuild && \
-    echo "dotnet /tmp/mxbuild/modeler/mxbuild.dll --java-home=/usr/lib/jvm/jdk-11.0.2 --java-exe-path=/usr/lib/jvm/jdk-11.0.2/bin/java \$@" >>/bin/mxbuild && \
+    echo "/tmp/mxbuild/modeler/mxbuild --java-home=/opt/java/openjdk --java-exe-path=/opt/java/openjdk/bin/java \$@" >>/bin/mxbuild && \
     chmod +x /bin/mxbuild && \
 \
     echo "#!/bin/bash -x" >/bin/mx && \
-    echo "dotnet /tmp/mxbuild/modeler/mx.dll \$@" >>/bin/mx && \
+    echo "/tmp/mxbuild/modeler/mx \$@" >>/bin/mx && \
     chmod +x /bin/mx

automation/run-e2e/docker/mxruntime.Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.19_7-slim
+FROM eclipse-temurin:17-jdk-jammy
 
 ARG MENDIX_VERSION
 

automation/run-e2e/docker/mxruntimeRC.Dockerfile

@@ -1,4 +1,3 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.19_7-slim
 
 ARG MENDIX_VERSION
 

automation/run-e2e/lib/docker-utils.mjs

@@ -15,11 +15,10 @@ export function getFullImageName(name, mendixVersion) {
 export async function buildImage(name, mendixVersion) {
     const image = getFullImageName(name, mendixVersion);
     const dockerDir = fileURLToPath(new URL("../docker", import.meta.url));
-    const dockerFile = p.join(dockerDir, process.env.RC ? `${name}RC.Dockerfile`:`${name}.Dockerfile` );
+    const dockerFile = p.join(dockerDir, process.env.RC ? `${name}RC.Dockerfile` : `${name}.Dockerfile`);
     const runnumber = process.env.CI && process.env.GITHUB_RUN_ID;
 
     const args = [
-        `--platform=linux/amd64`,
         `--file ${dockerFile}`,
         `--build-arg MENDIX_VERSION=${mendixVersion}`,
         `--tag ${image}`,
@@ -150,9 +149,7 @@ export function startPlaywright(ip, freePort) {
 
     console.log("Start Playwright in", startingPoint);
 
-    const args = [
-        `--project=${browserPlaywright}`,
-    ];
+    const args = [`--project=${browserPlaywright}`];
     const command = [`${modernClientMode} ${baseURL} playwright test`, ...args].join(" ");
 
     execSync(command, { stdio: "inherit" });

automation/run-e2e/mendix-versions.json

@@ -1,5 +1,5 @@
 {
-    "latest": "10.8.1.29725",
+    "latest": "10.12.0.38909",
     "9": "9.24.0.2965",
     "8": "8.18.24.2858"
 }

packages/pluggableWidgets/color-picker-web/e2e/ColorPicker.spec.js

@@ -112,9 +112,14 @@ test.describe("color-picker-web", () => {
             await page.waitForLoadState("networkidle");
         });
 
-        test("hex", async ({ page }) => {
+        test.fixme("hex", async ({ page }) => {
             const hexInput = await page.locator(".mx-name-colorPicker24 input");
             await expect(hexInput).toBeVisible();
+            await page.reload();
+            await page.waitForLoadState("networkidle");
+            await expect(hexInput).toBeVisible({ timeout: 10000 });
+            await expect(hexInput).toBeEnabled({ timeout: 10000 });
+            await expect(hexInput).toBeEditable({ timeout: 10000 });
             await expect(hexInput).toHaveValue("#4caf50");
         });
 

packages/pluggableWidgets/popup-menu-web/e2e/PopupMenu.spec.js

@@ -78,7 +78,8 @@ test.describe("Popup-menu-web", () => {
 
         test("shows a new menu list when on hover is triggered", async ({ page }) => {
             await page.click(".mx-name-actionButton1");
-            const button25 = await page.locator(".mx-name-actionButton25");
+            await page.waitForLoadState("networkidle");
+            const button25 = page.getByRole("button", { name: "Trigger On Hover" });
             await expect(button25).toBeVisible();
             await button25.hover();
             const text42 = await page.locator(".mx-name-text42");