Skip to content

Commit

Permalink
Update yarn to current latest in 1.22.x series (getredash#6858)
Browse files Browse the repository at this point in the history
* Update yarn to current latest in 1.22.x series

* Use an environment variable for the yarn version

As suggested by @lucydodo:

  getredash#6858 (comment)

Thanks heaps. :)
  • Loading branch information
justinclift authored Apr 8, 2024
1 parent 82d88ed commit 24dec19
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile.cypress
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR $APP

COPY package.json yarn.lock .yarnrc $APP/
COPY viz-lib $APP/viz-lib
RUN npm install [email protected].19 -g && yarn --frozen-lockfile --network-concurrency 1 > /dev/null
RUN npm install [email protected].22 -g && yarn --frozen-lockfile --network-concurrency 1 > /dev/null

COPY . $APP

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- master
env:
NODE_VERSION: 18
YARN_VERSION: 1.22.22
jobs:
backend-lint:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Install Dependencies
run: |
npm install --global --force [email protected].19
npm install --global --force [email protected].22
yarn cache clean && yarn --frozen-lockfile --network-concurrency 1
- name: Set up Docker Buildx
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:18-bookworm as frontend-builder

RUN npm install --global --force [email protected].19
RUN npm install --global --force [email protected].22

# Controls whether to build the frontend assets
ARG skip_frontend_build
Expand Down

0 comments on commit 24dec19

Please sign in to comment.