From 24eed963d3018e3dc6a23f578d9e11e4048872e7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 31 Mar 2023 16:06:08 +0100 Subject: [PATCH] Use frozen lockfile instead of pure lockfile on yarn install (#10493) --- .github/workflows/i18n_check.yml | 2 +- scripts/ci/install-deps.sh | 6 +++--- scripts/ci/layered.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/i18n_check.yml b/.github/workflows/i18n_check.yml index d1fa718802..9d9983ab87 100644 --- a/.github/workflows/i18n_check.yml +++ b/.github/workflows/i18n_check.yml @@ -34,7 +34,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: i18n Check run: "yarn run diff-i18n" diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh index 544045c7ed..4843fc8879 100755 --- a/scripts/ci/install-deps.sh +++ b/scripts/ci/install-deps.sh @@ -13,16 +13,16 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk [ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF yarn link -yarn install --pure-lockfile $@ +yarn install --frozen-lockfile $@ popd 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 yarn link matrix-js-sdk yarn link @matrix-org/analytics-events -yarn install --pure-lockfile $@ +yarn install --frozen-lockfile $@ diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh index cd3dc7442c..55c7e25351 100755 --- a/scripts/ci/layered.sh +++ b/scripts/ci/layered.sh @@ -18,7 +18,7 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk [ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF yarn link -yarn install --pure-lockfile +yarn install --frozen-lockfile popd # Also set up matrix-analytics-events so we get the latest from @@ -26,7 +26,7 @@ popd 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 @@ -34,13 +34,13 @@ popd yarn link matrix-js-sdk yarn link @matrix-org/analytics-events yarn link -yarn install --pure-lockfile +yarn install --frozen-lockfile # Finally, set up element-web scripts/fetchdep.sh vector-im element-web pushd element-web yarn link matrix-js-sdk yarn link matrix-react-sdk -yarn install --pure-lockfile +yarn install --frozen-lockfile yarn build:res popd