Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TECH-1635 Revert all changes #71

Merged
merged 1 commit into from
Mar 18, 2024
Merged

TECH-1635 Revert all changes #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci.build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} .
4 changes: 1 addition & 3 deletions env.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@jahia/cypress",
"version": "3.19.2",
"version": "3.19.3",
"scripts": {
"build": "tsc",
"lint": "eslint src -c .eslintrc.json --ext .ts"
},
"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",
Expand Down
Loading