From 06f887c150ed11b41e3141bdee165d8a191ef30e Mon Sep 17 00:00:00 2001 From: Rares Matei Date: Mon, 13 Nov 2023 23:07:42 +0100 Subject: [PATCH] chore(repo): use new workflows launch templates (#20213) Co-authored-by: Brian Bailey <126210301+brian-nrwl@users.noreply.github.com> --- .circleci/config.yml | 2 +- .nx/workflows/agents.yaml | 100 ++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02a411c143698..053bfec73e091 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ jobs: NX_CI_EXECUTION_ENV: 'linux' steps: - checkout - - run: npx nx-cloud@next start-ci-run --stop-agents-after="e2e" + - run: npx nx-cloud@next start-ci-run --distributes-on="8 linux-medium" --stop-agents-after="e2e" - run: command: | sudo apt-get update diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml index 7a5cfe9ca1c61..78088ee461150 100644 --- a/.nx/workflows/agents.yaml +++ b/.nx/workflows/agents.yaml @@ -1,59 +1,55 @@ -parallelism: 8 -env: - CI: 'true' - GIT_AUTHOR_EMAIL: test@test.com - GIT_AUTHOR_NAME: Test - GIT_COMMITTER_EMAIL: test@test.com - GIT_COMMITTER_NAME: Test - NX_E2E_CI_CACHE_KEY: e2e-circleci-linux - NX_VERBOSE_LOGGING: 'false' - NX_DAEMON: 'true' - NX_PERF_LOGGING: 'false' - NX_NATIVE_LOGGING: 'false' - SELECTED_PM: 'pnpm' - NX_E2E_RUN_E2E: 'true' - NPM_CONFIG_PREFIX: '/home/workflows/.npm-global' - NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}' -on: - - events: - - CREATE_RUN_GROUP -steps: - - name: Checkout - uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/checkout/main.yaml' - - - name: Cache restore - uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/cache/main.yaml' +launch-templates: + linux-medium: env: - KEY: 'pnpm-lock.yaml' - PATHS: | - node_modules - ~/.cache/Cypress - ~/.pnpm-store - BASE_BRANCH: 'master' + CI: 'true' + GIT_AUTHOR_EMAIL: test@test.com + GIT_AUTHOR_NAME: Test + GIT_COMMITTER_EMAIL: test@test.com + GIT_COMMITTER_NAME: Test + NX_E2E_CI_CACHE_KEY: e2e-circleci-linux + NX_VERBOSE_LOGGING: 'false' + NX_DAEMON: 'true' + NX_PERF_LOGGING: 'false' + NX_NATIVE_LOGGING: 'false' + SELECTED_PM: 'pnpm' + NX_E2E_RUN_E2E: 'true' + NPM_CONFIG_PREFIX: '/home/workflows/.npm-global' + NX_CLOUD_ACCESS_TOKEN: '{{secrets.NX_CLOUD_ACCESS_TOKEN}}' + init-steps: + - name: Checkout + uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/checkout/main.yaml' + + - name: Cache restore + uses: 'nrwl/nx-cloud-workflows/v1.1/workflow-steps/cache/main.yaml' + env: + KEY: 'pnpm-lock.yaml' + PATHS: | + node_modules + ~/.cache/Cypress + ~/.pnpm-store + BASE_BRANCH: 'master' - - name: Install Pnpm - script: | - npm install -g @pnpm/exe@8.7.4 + - name: Install Pnpm + script: | + npm install -g @pnpm/exe@8.7.4 - - name: Pnpm Install - script: | - pnpm install --frozen-lockfile + - name: Pnpm Install + script: | + pnpm install --frozen-lockfile - - name: Install Cypress - script: pnpm exec cypress install + - name: Install Cypress + script: pnpm exec cypress install - - name: Install Rust - script: | - curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y - source "$HOME/.cargo/env" - rustup toolchain install 1.70.0 + - name: Install Rust + script: | + curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y + source "$HOME/.cargo/env" + rustup toolchain install 1.70.0 - - name: Configure git metadata (needed for lerna smoke tests) - script: | - git config --global user.email test@test.com - git config --global user.name "Test Test" + - name: Configure git metadata (needed for lerna smoke tests) + script: | + git config --global user.email test@test.com + git config --global user.name "Test Test" - - name: Run Agent - script: | - source "$HOME/.cargo/env" - npx nx-cloud start-agent + - name: Load Cargo Env + script: echo "PATH=$HOME/.cargo/bin:$PATH" >> $NX_CLOUD_ENV