diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7d00670ed..b6b25e7f8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,7 +137,7 @@ jobs: uses: actions/cache@v4 with: path: | - /opt/Homebrew + /opt/homebrew ~/Library/Caches/Homebrew key: nrwl-nx-homebrew-packages @@ -152,7 +152,7 @@ jobs: uses: actions/cache@v4 with: path: | - /opt/Homebrew + /opt/homebrew ~/Library/Caches/Homebrew key: nrwl-nx-homebrew-packages diff --git a/e2e/utils/global-setup.ts b/e2e/utils/global-setup.ts index a212a42ac4..a6cf28175c 100644 --- a/e2e/utils/global-setup.ts +++ b/e2e/utils/global-setup.ts @@ -12,12 +12,13 @@ export default async function (globalConfig: Config.ConfigGlobals) { process.env.NX_VERBOSE_LOGGING === 'true' || !!globalConfig.verbose; /** - * For e2e-ci & macos-local-e2e we populate the verdaccio storage up front, but for other workflows we need + * For e2e-ci, e2e-local and macos-local-e2e we populate the verdaccio storage up front, but for other workflows we need * to run the full local release process before running tests. */ - const requiresLocalRelease = - !process.env.NX_TASK_TARGET_TARGET?.startsWith('e2e-ci') && - !process.env.NX_TASK_TARGET_TARGET?.startsWith('e2e-macos-local'); + const prefixes = ['e2e-ci', 'e2e-macos-local', 'e2e-local']; + const requiresLocalRelease = !prefixes.some((prefix) => + process.env.NX_TASK_TARGET_TARGET?.startsWith(prefix) + ); const listenAddress = 'localhost'; const port = process.env.NX_LOCAL_REGISTRY_PORT ?? '4873'; diff --git a/nx.json b/nx.json index ef992a514f..576bb298cd 100644 --- a/nx.json +++ b/nx.json @@ -127,7 +127,11 @@ }, "e2e-local": { "cache": true, - "inputs": ["e2eInputs", "^production"] + "inputs": ["e2eInputs", "^production"], + "dependsOn": [ + "@nx/nx-source:populate-local-registry-storage", + "@nx/nx-source:local-registry" + ] }, "e2e-ci": { "inputs": ["e2eInputs", "^production"]