From a3a0400728bca8a69a21a075cd2bd51c0b64a4d3 Mon Sep 17 00:00:00 2001 From: gjulivan Date: Fri, 8 Nov 2024 11:28:00 +0100 Subject: [PATCH 1/5] chore(atlas): atlas core and web content increase min version --- packages/atlas-core/CHANGELOG.md | 4 ++++ packages/atlas-core/package.json | 8 ++++---- packages/atlas-web-content/CHANGELOG.md | 1 + packages/atlas-web-content/package.json | 8 ++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/atlas-core/CHANGELOG.md b/packages/atlas-core/CHANGELOG.md index 558c2c7d2..e77c8236e 100644 --- a/packages/atlas-core/CHANGELOG.md +++ b/packages/atlas-core/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Changed + +- We update atlas-core minimum version to SP 10.12.6. + ## [3.15.0] Atlas Core - 2024-11-4 ### Fixed diff --git a/packages/atlas-core/package.json b/packages/atlas-core/package.json index 85e9d5392..5e3c19869 100644 --- a/packages/atlas-core/package.json +++ b/packages/atlas-core/package.json @@ -1,7 +1,7 @@ { "name": "atlas-core", "moduleName": "Atlas Core", - "version": "3.15.0", + "version": "3.16.0", "license": "Apache-2.0", "copyright": "© Mendix Technology BV 2024. All rights reserved.", "repository": { @@ -9,13 +9,13 @@ "url": "https://github.com/mendix/atlas.git" }, "marketplace": { - "minimumMXVersion": "10.6.0.23934", + "minimumMXVersion": "10.12.6.46815", "marketplaceId": 117187 }, "testProject": { "githubUrl": "https://github.com/mendix/Atlas-Design-System", - "branchName": "lts/9.24", - "mxVersion": "10.5.0.21627" + "branchName": "mts/10.12", + "mxVersion": "10.12.6.46815" }, "scripts": { "build:module": "ts-node ./scripts/build.ts build", diff --git a/packages/atlas-web-content/CHANGELOG.md b/packages/atlas-web-content/CHANGELOG.md index 09362a47b..4727fe66a 100644 --- a/packages/atlas-web-content/CHANGELOG.md +++ b/packages/atlas-web-content/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed - We update Pageheader_WithSearch building block to use combobox instead of Dropdown to support modern client. +- We updated Atlas Web Content minimum version to SP 10.12.6. ## [3.6.0] Atlas Web Content - 2024-6-11 diff --git a/packages/atlas-web-content/package.json b/packages/atlas-web-content/package.json index 698d4723f..6b5a131ed 100644 --- a/packages/atlas-web-content/package.json +++ b/packages/atlas-web-content/package.json @@ -1,7 +1,7 @@ { "name": "atlas-web-content", "moduleName": "Atlas Web Content", - "version": "3.6.1", + "version": "3.7.0", "license": "Apache-2.0", "copyright": "© Mendix Technology BV 2024. All rights reserved.", "repository": { @@ -9,13 +9,13 @@ "url": "https://github.com/mendix/atlas.git" }, "marketplace": { - "minimumMXVersion": "10.6.0.23934", + "minimumMXVersion": "10.12.6.46815", "marketplaceId": 117183 }, "testProject": { "githubUrl": "https://github.com/mendix/Atlas-Design-System", - "branchName": "lts/9.24", - "mxVersion": "10.5.0.21627" + "branchName": "mts/10.12", + "mxVersion": "10.12.6.46815" }, "scripts": { "build:module": "ts-node ./scripts/build.ts build", From 0993977d3a5b1ccf0f776be46038cfa5b9760eba Mon Sep 17 00:00:00 2001 From: gjulivan Date: Fri, 8 Nov 2024 12:02:12 +0100 Subject: [PATCH 2/5] chore(atlas): update docker --- packages/atlas/scripts/e2e.playwright.js | 4 +- packages/atlas/scripts/m2ee.yml | 2 +- packages/atlas/scripts/mxbuild.Dockerfile | 45 ++++++++++++++--------- packages/atlas/scripts/runtime.Dockerfile | 2 +- scripts/mxbuild.Dockerfile | 43 +++++++++++++--------- 5 files changed, 57 insertions(+), 39 deletions(-) diff --git a/packages/atlas/scripts/e2e.playwright.js b/packages/atlas/scripts/e2e.playwright.js index 7900ce93a..fbc8780d9 100644 --- a/packages/atlas/scripts/e2e.playwright.js +++ b/packages/atlas/scripts/e2e.playwright.js @@ -55,7 +55,7 @@ async function main() { if (!existingImages) { console.log(`Creating new mxbuild docker image...`); execSync( - `docker build --platform=linux/amd64 -f ${join(__dirname, "mxbuild.Dockerfile")} ` + + `docker build -f ${join(__dirname, "mxbuild.Dockerfile")} ` + `--build-arg MENDIX_VERSION=${mendixVersion} ` + `-t mxbuild:${mendixVersion} ${__dirname}`, { stdio: "inherit" } @@ -66,7 +66,7 @@ async function main() { if (!existingRuntimeImages) { console.log(`Creating new runtime docker image...`); execSync( - `docker build --platform=linux/amd64 -f ${join(__dirname, "runtime.Dockerfile")} ` + + `docker build -f ${join(__dirname, "runtime.Dockerfile")} ` + `--build-arg MENDIX_VERSION=${mendixVersion} ` + `-t mxruntime:${mendixVersion} ${__dirname}`, { stdio: "inherit" } diff --git a/packages/atlas/scripts/m2ee.yml b/packages/atlas/scripts/m2ee.yml index 81006db63..3f7d563d1 100644 --- a/packages/atlas/scripts/m2ee.yml +++ b/packages/atlas/scripts/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: diff --git a/packages/atlas/scripts/mxbuild.Dockerfile b/packages/atlas/scripts/mxbuild.Dockerfile index bb1d2cb6d..e1de64c9d 100644 --- a/packages/atlas/scripts/mxbuild.Dockerfile +++ b/packages/atlas/scripts/mxbuild.Dockerfile @@ -1,28 +1,37 @@ -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} 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 && \ \ - echo "Downloading mxbuild ${MENDIX_VERSION}..." && \ - wget -q https://cdn.mendix.com/runtime/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 && \ -\ - 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 && \ - chmod +x /bin/mx + echo "/tmp/mxbuild/modeler/mx \$@" >>/bin/mx && \ + chmod +x /bin/mx \ No newline at end of file diff --git a/packages/atlas/scripts/runtime.Dockerfile b/packages/atlas/scripts/runtime.Dockerfile index 72e0d2a73..8092995fa 100644 --- a/packages/atlas/scripts/runtime.Dockerfile +++ b/packages/atlas/scripts/runtime.Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:jdk-11.0.19_7-slim +FROM eclipse-temurin:17-jdk-jammy ARG MENDIX_VERSION diff --git a/scripts/mxbuild.Dockerfile b/scripts/mxbuild.Dockerfile index bb1d2cb6d..9c65d3f6c 100644 --- a/scripts/mxbuild.Dockerfile +++ b/scripts/mxbuild.Dockerfile @@ -1,28 +1,37 @@ -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} 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 && \ \ - echo "Downloading mxbuild ${MENDIX_VERSION}..." && \ - wget -q https://cdn.mendix.com/runtime/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 && \ -\ - 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 From 9c88f5275eaf62952db656bcaf7f3def5427d15e Mon Sep 17 00:00:00 2001 From: gjulivan Date: Fri, 8 Nov 2024 12:02:12 +0100 Subject: [PATCH 3/5] chore(atlas): update docker --- packages/atlas/scripts/e2e.playwright.js | 4 +- packages/atlas/scripts/m2ee.yml | 2 +- packages/atlas/scripts/mxbuild.Dockerfile | 45 ++++++++++++-------- packages/atlas/scripts/runtime.Dockerfile | 2 +- scripts/mxbuild.Dockerfile | 43 +++++++++++-------- scripts/release/module-automation/commons.js | 2 +- 6 files changed, 58 insertions(+), 40 deletions(-) diff --git a/packages/atlas/scripts/e2e.playwright.js b/packages/atlas/scripts/e2e.playwright.js index 7900ce93a..fbc8780d9 100644 --- a/packages/atlas/scripts/e2e.playwright.js +++ b/packages/atlas/scripts/e2e.playwright.js @@ -55,7 +55,7 @@ async function main() { if (!existingImages) { console.log(`Creating new mxbuild docker image...`); execSync( - `docker build --platform=linux/amd64 -f ${join(__dirname, "mxbuild.Dockerfile")} ` + + `docker build -f ${join(__dirname, "mxbuild.Dockerfile")} ` + `--build-arg MENDIX_VERSION=${mendixVersion} ` + `-t mxbuild:${mendixVersion} ${__dirname}`, { stdio: "inherit" } @@ -66,7 +66,7 @@ async function main() { if (!existingRuntimeImages) { console.log(`Creating new runtime docker image...`); execSync( - `docker build --platform=linux/amd64 -f ${join(__dirname, "runtime.Dockerfile")} ` + + `docker build -f ${join(__dirname, "runtime.Dockerfile")} ` + `--build-arg MENDIX_VERSION=${mendixVersion} ` + `-t mxruntime:${mendixVersion} ${__dirname}`, { stdio: "inherit" } diff --git a/packages/atlas/scripts/m2ee.yml b/packages/atlas/scripts/m2ee.yml index 81006db63..3f7d563d1 100644 --- a/packages/atlas/scripts/m2ee.yml +++ b/packages/atlas/scripts/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: diff --git a/packages/atlas/scripts/mxbuild.Dockerfile b/packages/atlas/scripts/mxbuild.Dockerfile index bb1d2cb6d..e1de64c9d 100644 --- a/packages/atlas/scripts/mxbuild.Dockerfile +++ b/packages/atlas/scripts/mxbuild.Dockerfile @@ -1,28 +1,37 @@ -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} 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 && \ \ - echo "Downloading mxbuild ${MENDIX_VERSION}..." && \ - wget -q https://cdn.mendix.com/runtime/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 && \ -\ - 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 && \ - chmod +x /bin/mx + echo "/tmp/mxbuild/modeler/mx \$@" >>/bin/mx && \ + chmod +x /bin/mx \ No newline at end of file diff --git a/packages/atlas/scripts/runtime.Dockerfile b/packages/atlas/scripts/runtime.Dockerfile index 72e0d2a73..8092995fa 100644 --- a/packages/atlas/scripts/runtime.Dockerfile +++ b/packages/atlas/scripts/runtime.Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:jdk-11.0.19_7-slim +FROM eclipse-temurin:17-jdk-jammy ARG MENDIX_VERSION diff --git a/scripts/mxbuild.Dockerfile b/scripts/mxbuild.Dockerfile index bb1d2cb6d..9c65d3f6c 100644 --- a/scripts/mxbuild.Dockerfile +++ b/scripts/mxbuild.Dockerfile @@ -1,28 +1,37 @@ -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} 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 && \ \ - echo "Downloading mxbuild ${MENDIX_VERSION}..." && \ - wget -q https://cdn.mendix.com/runtime/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 && \ -\ - 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 diff --git a/scripts/release/module-automation/commons.js b/scripts/release/module-automation/commons.js index 6d71271d5..a883f5605 100644 --- a/scripts/release/module-automation/commons.js +++ b/scripts/release/module-automation/commons.js @@ -83,7 +83,7 @@ async function createModuleMpkInDocker(sourceDir, moduleName, mendixVersion, exc const projectFile = basename((await getFiles(sourceDir, [`.mpr`]))[0]); await execShellCommand( `docker run -t -v ${sourceDir}:/source ` + - `--rm mxbuild:${mendixVersion} bash -c "dotnet /tmp/mxbuild/modeler/mx.dll create-module-package ${ + `--rm mxbuild:${mendixVersion} bash -c "/tmp/mxbuild/modeler/mx create-module-package ${ excludeFilesRegExp ? `--exclude-files='${excludeFilesRegExp}'` : "" } /source/${projectFile} ${moduleName}"` ); From 2dcf52aea58a6b014160caaaf03895a28cf94a3c Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 8 Nov 2024 14:03:49 +0100 Subject: [PATCH 4/5] chore(atlas): update docker --- scripts/release/module-automation/commons.js | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/release/module-automation/commons.js b/scripts/release/module-automation/commons.js index a883f5605..35bf16492 100644 --- a/scripts/release/module-automation/commons.js +++ b/scripts/release/module-automation/commons.js @@ -81,12 +81,21 @@ async function createModuleMpkInDocker(sourceDir, moduleName, mendixVersion, exc // Build testProject via mxbuild const projectFile = basename((await getFiles(sourceDir, [`.mpr`]))[0]); - await execShellCommand( - `docker run -t -v ${sourceDir}:/source ` + - `--rm mxbuild:${mendixVersion} bash -c "/tmp/mxbuild/modeler/mx create-module-package ${ - excludeFilesRegExp ? `--exclude-files='${excludeFilesRegExp}'` : "" - } /source/${projectFile} ${moduleName}"` - ); + + const args = [ + // update widgets + "mx", + "update-widgets", + "--loose-version-check", + `/source/${projectFile}`, + "&&", + "/tmp/mxbuild/modeler/mx create-module-package", + excludeFilesRegExp ? `--exclude-files='${excludeFilesRegExp}'` : "", + `/source/${projectFile}`, + moduleName + ].join(" "); + + await execShellCommand(`docker run -v ${sourceDir}:/source --rm mxbuild:${mendixVersion} bash -c "${args}"`); console.log(`Module ${moduleName} created successfully.`); } From 9f064d086a0f892d9c1998d50cfcd7240227aba8 Mon Sep 17 00:00:00 2001 From: Content Teams Date: Fri, 8 Nov 2024 13:10:13 +0000 Subject: [PATCH 5/5] chore(atlas-core): update changelogs --- packages/atlas-core/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/atlas-core/CHANGELOG.md b/packages/atlas-core/CHANGELOG.md index e77c8236e..8d8dd3bb6 100644 --- a/packages/atlas-core/CHANGELOG.md +++ b/packages/atlas-core/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [3.16.0] Atlas Core - 2024-11-8 + ### Changed - We update atlas-core minimum version to SP 10.12.6.