refs #6915 test_master24_8 #2067

Merged
alexm merged 561 commits from test_master24_8 into master 2024-02-22 07:31:34 +00:00
2 changed files with 9 additions and 9 deletions
Showing only changes of commit 2994a303b9 - Show all commits

View File

@ -13,7 +13,7 @@ RUN apt-get update \
graphicsmagick \
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y --no-install-recommends nodejs \
&& npm install -g npm@9.6.6
&& curl -fsSL https://get.pnpm.io/install.sh | env PNPM_VERSION=8.15.1 sh -
# Puppeteer
@ -39,12 +39,12 @@ RUN apt-get update \
WORKDIR /salix
COPY print/package.json print/package-lock.json print/
RUN npm ci --no-audit --prefer-offline --omit=dev --prefix=print
COPY print/package.json print/pnpm-lock.yaml print/
RUN pnpm install --prod --prefix=print
COPY package.json package-lock.json ./
COPY package.json pnpm-lock.yaml ./
COPY loopback/package.json loopback/
RUN npm ci --no-audit --prefer-offline --omit=dev
RUN pnpm install --prod
COPY loopback loopback
COPY back back

8
Jenkinsfile vendored
View File

@ -52,7 +52,7 @@ pipeline {
parallel {
stage('Backend') {
steps {
sh 'npm install --no-audit --prefer-offline'
sh 'pnpm install --prefer-offline'
}
}
stage('Frontend') {
@ -60,7 +60,7 @@ pipeline {
expression { FROM_GIT }
}
steps {
sh 'npm install --no-audit --prefer-offline --prefix=front'
sh 'pnpm install --prefer-offline --prefix=front'
}
}
stage('Print') {
@ -68,7 +68,7 @@ pipeline {
expression { FROM_GIT }
}
steps {
sh 'npm install --no-audit --prefer-offline --prefix=print'
sh 'pnpm install --prefer-offline --prefix=print'
}
}
}
@ -89,7 +89,7 @@ pipeline {
}
stage('Frontend') {
steps {
sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=6'
sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
}
}
}