@jahia/cypress 7.2.0 → 7.4.0

package/ci.build.sh

@@ -41,4 +41,20 @@ if [ -d ./jahia-module ]; then
 fi
 YARN_VERSION=${YARN_VERSION:-1.22.19}
 
-docker build --build-arg YARN_VERSION=${YARN_VERSION} -f $BASEDIR/env.Dockerfile -t ${TESTS_IMAGE} .
+# Use Docker buildx with cache if enabled via environment variables
+if [ "$DOCKER_BUILD_CACHE_ENABLED" = "true" ]; then
+  echo "Docker cache is enabled, building using 'docker buildx build'"
+  echo "cache-from: $DOCKER_BUILDX_CACHE_FROM"
+  echo "cache-to: $DOCKER_BUILDX_CACHE_TO"
+  docker buildx build \
+    --cache-from "$DOCKER_BUILDX_CACHE_FROM" \
+    --cache-to "$DOCKER_BUILDX_CACHE_TO" \
+    --build-arg YARN_VERSION=${YARN_VERSION} \
+    -f $BASEDIR/env.Dockerfile \
+    -t ${TESTS_IMAGE} \
+    --load \
+    .
+else
+  echo "Docker cache is disabled, building using 'docker build'"
+  docker build --build-arg YARN_VERSION=${YARN_VERSION} -f $BASEDIR/env.Dockerfile -t ${TESTS_IMAGE} .
+fi

package/dist/utils/JCRHelper.js

@@ -142,6 +142,6 @@ var copyNode = function (pathOrId, destParentPathOrId, destName, apolloOptions)
             pathOrId: pathOrId,
             destParentPathOrId: destParentPathOrId,
             destName: destName
-        }, mutationFile: 'graphql/copyNode.graphql' }));
+        }, mutationFile: 'graphql/jcr/mutation/copyNode.graphql' }));
 };
 exports.copyNode = copyNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "7.2.0",
+  "version": "7.4.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts --max-warnings=0"

package/src/utils/JCRHelper.ts

@@ -179,6 +179,6 @@ export const copyNode = (pathOrId: string, destParentPathOrId: string, destName?
             destParentPathOrId: destParentPathOrId,
             destName: destName
         },
-        mutationFile: 'graphql/copyNode.graphql'
+        mutationFile: 'graphql/jcr/mutation/copyNode.graphql'
     });
 };