diff --git a/.ci/Dockerfile.cypress b/.ci/Dockerfile.cypress index 9a8140304e..e595fcc1ba 100644 --- a/.ci/Dockerfile.cypress +++ b/.ci/Dockerfile.cypress @@ -5,7 +5,7 @@ WORKDIR $APP COPY package.json yarn.lock .yarnrc $APP/ COPY viz-lib $APP/viz-lib -RUN npm install yarn@1.22.19 -g && yarn --frozen-lockfile --network-concurrency 1 > /dev/null +RUN npm install yarn@1.22.22 -g && yarn --frozen-lockfile --network-concurrency 1 > /dev/null COPY . $APP diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7273b324e9..e8098f5b0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,7 @@ on: - master env: NODE_VERSION: 18 + YARN_VERSION: 1.22.22 jobs: backend-lint: runs-on: ubuntu-22.04 @@ -88,7 +89,7 @@ jobs: cache: 'yarn' - name: Install Dependencies run: | - npm install --global --force yarn@1.22.19 + npm install --global --force yarn@$YARN_VERSION yarn cache clean && yarn --frozen-lockfile --network-concurrency 1 - name: Run Lint run: yarn lint:ci @@ -115,7 +116,7 @@ jobs: cache: 'yarn' - name: Install Dependencies run: | - npm install --global --force yarn@1.22.19 + npm install --global --force yarn@$YARN_VERSION yarn cache clean && yarn --frozen-lockfile --network-concurrency 1 - name: Run App Tests run: yarn test @@ -152,7 +153,7 @@ jobs: echo "CODE_COVERAGE=true" >> "$GITHUB_ENV" - name: Install Dependencies run: | - npm install --global --force yarn@1.22.19 + npm install --global --force yarn@$YARN_VERSION yarn cache clean && yarn --frozen-lockfile --network-concurrency 1 - name: Setup Redash Server run: | diff --git a/.github/workflows/preview-image.yml b/.github/workflows/preview-image.yml index cf8b024103..ee81a6911f 100644 --- a/.github/workflows/preview-image.yml +++ b/.github/workflows/preview-image.yml @@ -46,7 +46,7 @@ jobs: - name: Install Dependencies run: | - npm install --global --force yarn@1.22.19 + npm install --global --force yarn@1.22.22 yarn cache clean && yarn --frozen-lockfile --network-concurrency 1 - name: Set up Docker Buildx diff --git a/Dockerfile b/Dockerfile index 95b8291556..20fdcde61d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:18-bookworm as frontend-builder -RUN npm install --global --force yarn@1.22.19 +RUN npm install --global --force yarn@1.22.22 # Controls whether to build the frontend assets ARG skip_frontend_build