Skip to content
Snippets Groups Projects
Commit e15ef4bc authored by Bartek Wrona's avatar Bartek Wrona
Browse files

NPM toolset update:

- emsdk to 4.0.1
- TypeScript to 5.7.3
- PlayWright to 1.49
- NodeJS to 20.18.1
- PNPM to 9.15.4
parent 6b9e9e75
No related branches found
No related tags found
1 merge request!69NPM toolset update
......@@ -12,6 +12,7 @@ USER root
RUN apt-get update && \
DEBIAN_FRONTEND=noniteractive apt-get install -y \
apt-transport-https ca-certificates \
git \
jq \
ninja-build \
......@@ -22,7 +23,7 @@ RUN apt-get update && \
FROM supplemented_emscripten_sdk AS supplemented_node_sdk
ARG NODEJS_VERSION=v18.19.0
ARG NODEJS_VERSION=v20.18.1
ENV NODEJS_VERSION=${NODEJS_VERSION}
USER emscripten
......@@ -45,23 +46,23 @@ RUN source "${EMSDK}/emsdk_env.sh" && \
nvm install "${NODEJS_VERSION}" && \
nvm use "${NODEJS_VERSION}" && \
corepack enable pnpm && \
corepack install -g pnpm@9.1.1 && \
corepack install -g pnpm@9.15.4 && \
pnpm config set store-dir ${PNPM_HOME}/preinstalled-store --global && \
pnpm config set global-dir ${PNPM_HOME}/preinstalled-store-g --global && \
pnpm env use --global "${NODEJS_VERSION}" && \
pnpm add -g \
playwright@~1.39.0 \
@playwright/test@~1.39.0 \
playwright@~1.49.1 \
@playwright/test@~1.49.1 \
ts-proto@~1.158.0 \
tslib@~2.6.2 \
typescript@~5.2.2 \
rollup@~4.3.0 \
tslib@~2.8.1 \
typescript@~5.7.3 \
rollup@~4.22.0 \
rollup/plugin-node-resolve@~15.2.3 \
rollup/plugin-commonjs@~25.0.7 \
rollup-plugin-typescript2@~0.36.0 \
types/node@~20.10.6 \
typedoc@~0.25.3 \
typedoc-plugin-markdown@~3.17.1 \
types/node@~22.10.6 \
typedoc@~0.27.6 \
typedoc-plugin-markdown@~4.4.1 \
protobufjs@~7.2.5 && \
pnpm dlx playwright install chromium && \
git config --global advice.detachedHead false && \
......
variable "CI_REGISTRY_IMAGE" {}
variable "CI_COMMIT_SHA" {}
variable "EMSCRIPTEN_VERSION" {
default = "3.1.62"
default = "4.0.1"
}
variable "PSQL_IMAGE_VERSION" {
default = "14-1" # After updating tag here, remeber to also update it in job 'psql_image_test'
......@@ -83,7 +83,7 @@ target "tox-test-runner" {
target "emsdk" {
dockerfile = "Dockerfile.emscripten"
tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}-2")
tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}-1")
cache-from = generate-cache-from("emsdk", "${EMSCRIPTEN_VERSION}")
cache-to = generate-cache-to("emsdk", "${EMSCRIPTEN_VERSION}")
args = {
......
......@@ -5,11 +5,11 @@ SCRIPTSDIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
SRCDIR="${SCRIPTSDIR}/../../"
REGISTRY=${1:-"registry.gitlab.syncad.com/hive/common-ci-configuration/"}
EMSDK_VERSION=${1:-"3.1.62"}
EMSDK_VERSION=${1:-"4.0.1"}
export DOCKER_BUILDKIT=1
docker build --target=supplemented_emscripten_builder \
--build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \
--tag "${REGISTRY}emsdk:${EMSDK_VERSION}-2" \
--tag "${REGISTRY}emsdk:${EMSDK_VERSION}-1" \
--file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment