Updated config

mendix · Nov 16, 2023 · 2ae8c18 · 2ae8c18
1 parent 1103ee0
commit 2ae8c18
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/.github/scripts/mxbuild.Dockerfile b/.github/scripts/mxbuild.Dockerfile
@@ -8,21 +8,21 @@ RUN \
     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 && \
-\
+    rm /tmp/openjdk.tar.gz 
+RUN \
     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 && \
-\
+    rm /tmp/mxbuild.tar.gz 
+RUN \
     apt-get -qq remove -y wget && \
-    apt-get clean && \
-\
+    apt-get clean 
+RUN \
     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 && \
-    chmod +x /bin/mxbuild && \
-\
+    chmod +x /bin/mxbuild 
+RUN \
     echo "#!/bin/bash -x" >/bin/mx && \
     echo "dotnet /tmp/mxbuild/modeler/mx.dll \$@" >>/bin/mx && \
     chmod +x /bin/mx
diff --git a/.github/workflows/NativePipeline.yml b/.github/workflows/NativePipeline.yml
@@ -108,6 +108,8 @@ jobs:
     runs-on: ubuntu-22.04
     container: ghcr.io/mendix/native-widgets/mxbuild:${{ needs.mendix-version.outputs.mendix-version }}
     steps:
+      - name: "Make sure curl is installed"
+        run: sudo apt-get install -y curl
       - name: "Download test project"
         run: curl -L -o project.zip https://github.com/mendix/Native-Mobile-Resources/archive/refs/heads/main.zip
       - name: "Extract test project"

diff --git a/configs/e2e/mendix-versions.json b/configs/e2e/mendix-versions.json
@@ -1,4 +1,4 @@
 {
-    "latest": "10.4.0.18337",
+    "latest": "10.3.1.17746",
     "8": "8.18.23.62193"
 }
diff --git a/scripts/automation/mxbuild.Dockerfile b/scripts/automation/mxbuild.Dockerfile
@@ -8,21 +8,21 @@ RUN \
     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 && \
-\
+    rm /tmp/openjdk.tar.gz 
+RUN \
     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 && \
-\
+    rm /tmp/mxbuild.tar.gz 
+RUN \
     apt-get -qq remove -y wget && \
-    apt-get clean && \
-\
+    apt-get clean 
+RUN \
     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 && \
-    chmod +x /bin/mxbuild && \
-\
+    chmod +x /bin/mxbuild 
+RUN \
     echo "#!/bin/bash -x" >/bin/mx && \
     echo "dotnet /tmp/mxbuild/modeler/mx.dll \$@" >>/bin/mx && \
     chmod +x /bin/mx