diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml index dd73209f2fcda..16eb1317327e5 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -98,3 +98,8 @@ runs: if: inputs.install && inputs.type == 'production' shell: bash run: YARN_ENABLE_HARDENED_MODE=${{ inputs.HARDENED_MODE }} yarn workspaces focus --all --production + + - name: restore yarn config file + if: inputs.install + shell: bash + run: git checkout -- .yarnrc.yml diff --git a/.yarnrc.yml b/.yarnrc.yml index 128ce3e5464c8..6543b343613d7 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -10,16 +10,6 @@ nodeLinker: node-modules plugins: - path: .yarn/plugins/@yarnpkg/plugin-engines.cjs - spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js" - -supportedArchitectures: - cpu: - - arm64 - - x64 - libc: - - glibc - - musl - os: - - linux + spec: 'https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js' yarnPath: .yarn/releases/yarn-4.11.0.cjs diff --git a/yarn.lock b/yarn.lock index 939cd51775af1..999452db5d501 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10796,8 +10796,8 @@ __metadata: typescript: "npm:~5.9.3" peerDependencies: "@rocket.chat/layout": "*" - "@rocket.chat/tools": 0.2.3 - "@rocket.chat/ui-contexts": 25.0.2 + "@rocket.chat/tools": 0.2.4-rc.0 + "@rocket.chat/ui-contexts": 26.0.0-rc.0 "@tanstack/react-query": "*" react: "*" react-hook-form: "*"