From ddc29325419ed37d74a7b8dee64befbfaea69703 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 31 Mar 2023 15:52:29 +0100 Subject: [PATCH] Use frozen lockfile instead of pure lockfile on yarn install (#25009) --- .github/workflows/static_analysis.yaml | 2 +- scripts/fetch-develop.deps.sh | 4 ++-- scripts/layered.sh | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index 42451b1dd..d1b9e380b 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -80,7 +80,7 @@ jobs: # Does not need branch matching as only analyses this layer - name: Install Deps - run: "yarn install --pure-lockfile" + run: "yarn install --frozen-lockfile" - name: Run Linter run: "yarn run lint:js" diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index 96464e789..8b728b87c 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -77,7 +77,7 @@ dodep matrix-org matrix-js-sdk pushd matrix-js-sdk yarn link -yarn install --pure-lockfile +yarn install --frozen-lockfile popd yarn link matrix-js-sdk @@ -91,7 +91,7 @@ dodep matrix-org matrix-react-sdk pushd matrix-react-sdk yarn link yarn link matrix-js-sdk -yarn install --pure-lockfile +yarn install --frozen-lockfile popd yarn link matrix-react-sdk diff --git a/scripts/layered.sh b/scripts/layered.sh index a63803bba..62b8b5a0b 100755 --- a/scripts/layered.sh +++ b/scripts/layered.sh @@ -14,7 +14,7 @@ set -ex # for the primary repo (element-web in this case). # Install dependencies, as we'll be using fetchdep.sh from matrix-react-sdk -yarn install --pure-lockfile +yarn install --frozen-lockfile # Pass appropriate repo to fetchdep.sh export PR_ORG=vector-im @@ -24,7 +24,7 @@ export PR_REPO=element-web node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk yarn link -yarn install --pure-lockfile +yarn install --frozen-lockfile popd # Also set up matrix-analytics-events so we get the latest from @@ -32,7 +32,7 @@ popd node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-analytics-events main pushd matrix-analytics-events yarn link -yarn install --pure-lockfile +yarn install --frozen-lockfile yarn build:ts popd @@ -42,7 +42,7 @@ pushd matrix-react-sdk yarn link yarn link matrix-js-sdk yarn link @matrix-org/analytics-events -yarn install --pure-lockfile +yarn install --frozen-lockfile popd # Link the layers into element-web