test: remove unnecessary arm64 build

mendix · Jun 27, 2024 · 6d7ac6e · 6d7ac6e
1 parent 5bb34ad
commit 6d7ac6e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 35 deletions.
diff --git a/.github/workflows/RunE2ERCNightlies.yml b/.github/workflows/RunE2ERCNightlies.yml
@@ -24,6 +24,8 @@ jobs:
           cache: "pnpm"
       - name: Install dependencies
         run: pnpm install
+      - name: Install Playwright Browsers
+        run: pnpm exec playwright install --with-deps chromium
       - name: Setup AWS credentials
         uses: aws-actions/configure-aws-credentials@fff2104678c2113fcefb9ae8294dc7ccb803e27c
         with:
@@ -46,11 +48,11 @@ jobs:
         run: |
           sudo find ${{ github.workspace }}/packages/* -type d -exec chmod 755 {} \;
           sudo find ${{ github.workspace }}/packages/* -type f -exec chmod 644 {} \;
-      - name: "Archive test screenshot diff results and test report"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+      - name: "Archive test screenshot diff results"
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         if: failure()
         with:
-          name: test-screenshot-results
+          name: test-screenshot-results-1
           path: |
             ${{ github.workspace }}/packages/**/**/test-results/**/*.png
             ${{ github.workspace }}/packages/**/**/test-results/**/*.zip

diff --git a/automation/run-e2e/docker/mxbuildRC.Dockerfile b/automation/run-e2e/docker/mxbuildRC.Dockerfile
@@ -3,36 +3,21 @@ FROM --platform=$BUILDPLATFORM eclipse-temurin:17-jdk-jammy
 ARG MENDIX_VERSION
 ARG BUILDPLATFORM
 
-SHELL ["/bin/bash", "-c"]
 RUN \
-echo "Downloading mxbuild ${MENDIX_VERSION} and docker building for ${BUILDPLATFORM}..." \
-    && case "${BUILDPLATFORM}" in \
-        linux/arm64) \
-            BINARY_URL="https://artifacts.rnd.mendix.com/runtimes/arm64-mxbuild-${MENDIX_VERSION}.tar.gz"; \
-            ;; \
-        linux/amd64) \
-            BINARY_URL="https://artifacts.rnd.mendix.com/runtimes/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://artifacts.rnd.mendix.com/runtimes/net8-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 update -qqy && \
     apt-get install -qqy libicu70 && \
     apt-get -qqy remove --auto-remove wget && \
     apt-get clean && \
-\
+    \
     echo "#!/bin/bash -x" >/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 "/tmp/mxbuild/modeler/mx \$@" >>/bin/mx && \
     chmod +x /bin/mx
diff --git a/automation/run-e2e/docker/mxruntimeRC.Dockerfile b/automation/run-e2e/docker/mxruntimeRC.Dockerfile
@@ -17,29 +17,29 @@ RUN apt-get update -qqy && \
     mkdir -p /var/log /var/opt/m2ee && \
     mv /tmp/m2ee/src/* /var/opt/m2ee && \
     chmod a=rwx /var/log/ /var/run/ && \
-\
+    \
     apt-get install -qqy \
-        python3 \
-        python3-pip \
-        unzip \
-        libfontconfig1 && \
-\
+    python3 \
+    python3-pip \
+    unzip \
+    libfontconfig1 && \
+    \
     pip3 install -q --upgrade pip && \
     pip install -q pyyaml httplib2 && \
-\
+    \
     echo "Downloading runtime ${MENDIX_VERSION}..." && \
     wget -q https://artifacts.rnd.mendix.com/runtimes/mendix-${MENDIX_VERSION}.tar.gz -O /tmp/runtime.tar.gz && \
     mkdir /var/opt/runtime && \
     tar xfz /tmp/runtime.tar.gz --directory /var/opt/runtime && \
     rm /tmp/runtime.tar.gz && \
     chown -R root:root /var/opt/runtime && \
-\
+    \
     apt-get -qqy remove --auto-remove git wget && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
-\
+    \
     ln -s $JAVA_HOME/bin/* /usr/bin/ && \
-\
+    \
     echo "#!/bin/bash -x" >/bin/m2ee && \
     echo "python3 /var/opt/m2ee/m2ee.py \$@" >>/bin/m2ee && \
     chmod +x /bin/m2ee