Revert "chore(repo): use new launch template syntax (nrwl#20169)" (nr…

…wl#20197)
Coly010 · Nov 10, 2023 · e4cb6c1 · e4cb6c1
1 parent 17990db
commit e4cb6c1
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 49 deletions.
diff --git 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 --distributes-on="8 linux-medium" --stop-agents-after="e2e"
+      - run: npx nx-cloud@next start-ci-run --stop-agents-after="e2e"
       - run:
           command: |
             sudo apt-get update

diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml
@@ -1,55 +1,59 @@
-launch-templates:
-  linux-medium:
-    env:
-      CI: 'true'
-      GIT_AUTHOR_EMAIL: [email protected]
-      GIT_AUTHOR_NAME: Test
-      GIT_COMMITTER_EMAIL: [email protected]
-      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'
+parallelism: 8
+env:
+  CI: 'true'
+  GIT_AUTHOR_EMAIL: [email protected]
+  GIT_AUTHOR_NAME: Test
+  GIT_COMMITTER_EMAIL: [email protected]
+  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'
-        env:
-          KEY: 'pnpm-lock.yaml'
-          PATHS: |
-            node_modules
-            ~/.cache/Cypress
-            ~/.pnpm-store
-          BASE_BRANCH: 'master'
+  - 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/[email protected]
+  - name: Install Pnpm
+    script: |
+      npm install -g @pnpm/[email protected]
 
-      - 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 [email protected]
-          git config --global user.name "Test Test"
+  - name: Configure git metadata (needed for lerna smoke tests)
+    script: |
+      git config --global user.email [email protected]
+      git config --global user.name "Test Test"
 
-      - name: Load Cargo Env
-        script: source "$HOME/.cargo/env"
+  - name: Run Agent
+    script: |
+      source "$HOME/.cargo/env"
+      npx nx-cloud start-agent