From 86e2730d3d3216b0874c603980c92518760ce862 Mon Sep 17 00:00:00 2001 From: Serge Huber Date: Mon, 18 Mar 2024 17:25:46 +0100 Subject: [PATCH] TECH-1635 Revert all changes --- ci.build.sh | 4 ++-- env.Dockerfile | 4 +--- package.json | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ci.build.sh b/ci.build.sh index 0d14489..d9f0040 100755 --- a/ci.build.sh +++ b/ci.build.sh @@ -39,6 +39,6 @@ if [ -d ./jahia-module ]; then fi cd .. fi -YARN_VERSION=${YARN_VERSION:-1.22.19} -docker build --build-arg YARN_VERSION=${YARN_VERSION} -f $BASEDIR/env.Dockerfile -t ${TESTS_IMAGE} . + +docker build -f $BASEDIR/env.Dockerfile -t ${TESTS_IMAGE} . diff --git a/env.Dockerfile b/env.Dockerfile index 0dacc6c..1b1518f 100644 --- a/env.Dockerfile +++ b/env.Dockerfile @@ -2,7 +2,6 @@ FROM cypress/browsers:node-20.10.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0. ARG MAVEN_VER="3.8.1" ARG MAVEN_BASE_URL="https://archive.apache.org/dist/maven/maven-3" -ARG YARN_VERSION="1.22.19" RUN apt-get update && apt-get install -y jq curl @@ -16,8 +15,7 @@ COPY --chown=jahians:jahians package.json yarn.lock /home/jahians/ RUN mkdir -p /home/jahians/run-artifacts /home/jahians/results /home/jahians/cypress/plugins #CI=true reduces the verbosity of the installation logs -RUN CI=true yarn set version ${YARN_VERSION} ; \ - yarn install +RUN CI=true yarn install --non-interactive COPY --chown=jahians:jahians . /home/jahians diff --git a/package.json b/package.json index ea54c45..0f71489 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@jahia/cypress", - "version": "3.19.2", + "version": "3.19.3", "scripts": { "build": "tsc", "lint": "eslint src -c .eslintrc.json --ext .ts" @@ -8,8 +8,8 @@ "bin": { "ci.build": "./ci.build.sh", "ci.startup": "./ci.startup.sh", - "env.debug": "./env.debug.sh", - "env.run": "./env.run.sh" + "env.run": "./env.run.sh", + "env.debug": "./env.debug.sh" }, "main": "dist/index.js", "types": "dist/index.d.ts",