Merge branch 'main' into umeshma/dev

microsoft · Feb 4, 2025 · 6242d08 · 6242d08
2 parents b12552e + 7901207
commit 6242d08
Show file tree

Hide file tree

Showing 59 changed files with 1,315 additions and 501 deletions.
diff --git a/.github/workflows/build-ts.yml b/.github/workflows/build-ts.yml
@@ -66,10 +66,6 @@ jobs:
         working-directory: ts
         run: |
           pnpm install --frozen-lockfile --strict-peer-dependencies
-      # - name: Install Playwright Browsers
-      #   if: ${{ runner.os == 'windows' && matrix.version == '22' }}
-      #   run: pnpm exec playwright install --with-deps
-      #   working-directory: ts/packages/shell
       - name: Build
         if: ${{ github.event_name != 'pull_request' || steps.filter.outputs.ts == 'true' }}
         working-directory: ts
@@ -85,43 +81,3 @@ jobs:
         working-directory: ts
         run: |
           npm run lint
-      # - name: Login to Azure
-      #   if: ${{ github.event_name != 'merge_group' }}
-      #   uses: azure/[email protected]
-      #   with:
-      #     client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_5B0D2D6BA40F4710B45721D2112356DD }}
-      #     tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_39BB903136F14B6EAD8F53A8AB78E3AA }}
-      #     subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_F36C1F2C4B2C49CA8DD5C52FAB98FA30 }}
-      # - name: Get Keys
-      #   if: ${{ github.event_name != 'merge_group' }}
-      #   run: |
-      #     node tools/scripts/getKeys.mjs --vault build-pipeline-kv
-      #   working-directory: ts
-      # - name: Test CLI - smoke
-      #   if: ${{ github.event_name != 'merge_group' }}
-      #   run: |
-      #     npm run start:dev 'prompt' 'why is the sky blue'
-      #   working-directory: ts/packages/cli
-      #   continue-on-error: true
-      # - name: Shell Tests - smoke (windows)
-      #   if: ${{ github.event_name != 'merge_group' && runner.os == 'windows' && matrix.version == '22' }}
-      #   timeout-minutes: 60
-      #   run: |
-      #     npx playwright test simple.spec.ts
-      #     rm ../../.env
-      # - name: Shell Tests - smoke (linux)
-      #   if: ${{ github.event_name != 'merge_group' && runner.os == 'Linux' && matrix.version == '22' }}
-      #   timeout-minutes: 60
-      #   run: |
-      #     Xvfb :99 -screen 0 1600x1200x24 & export DISPLAY=:99
-      #     npx playwright test simple.spec.ts
-      #     rm ../../.env          
-      #   working-directory: ts/packages/shell
-      #   continue-on-error: true
-      # - name: Live Tests
-      #   if: ${{ github.event_name != 'merge_group' && runner.os == 'linux' && matrix.version == '22' }}
-      #   timeout-minutes: 60
-      #   run: |
-      #     npm run test:live
-      #   working-directory: ts
-      #   continue-on-error: true
diff --git a/.github/workflows/shell-tests.yml b/.github/workflows/shell-tests.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["windows-latest"]
+        os: ["windows-latest", "ubuntu-latest"]
         version: [20]
 
     runs-on: ${{ matrix.os }}
@@ -98,19 +98,15 @@ jobs:
         timeout-minutes: 60
         run: |
           npm run shell:test
-          rm ../../.env
         working-directory: ts/packages/shell
         continue-on-error: true
 
       - name: Shell Tests (linux)
         if: ${{ runner.os == 'Linux' }}
         timeout-minutes: 60
-        # https://github.com/microsoft/playwright/issues/34251 - sysctl command
         run: |
-          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 
           Xvfb :99 -screen 0 1600x1200x24 & export DISPLAY=:99
           npm run shell:test
-          rm ../../.env
         working-directory: ts/packages/shell
         continue-on-error: true
 
@@ -129,3 +125,9 @@ jobs:
           path: ts/packages/shell/playwright-report/
           overwrite: true
           retention-days: 30
+
+      - name: Clean up Keys
+        run: |
+          rm ./.env
+        working-directory: ts
+        if: always()          
diff --git a/.github/workflows/smoke-tests-pull_request_targets.yml.bak b/.github/workflows/smoke-tests-pull_request_targets.yml.bak
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -9,8 +9,6 @@ on:
   workflow_dispatch:
   push:
     branches: ["main"]
-  # pull_request:
-  #   branches: ["main"]
   pull_request_target:
     branches: ["main"]
   merge_group:
@@ -27,7 +25,9 @@ permissions:
 
 env:
   NODE_OPTIONS: --max_old_space_size=8192
-  DEBUG: pw:browser*
+  #  DEBUG: pw:browser*                       # PlayWright debug messages
+  #  ELECTRON_ENABLE_LOGGING: true            # Electron debug messages
+  #  DEBUG: typeagent:*                       # TypeAgent debug messages
 
 jobs:
   shell_and_cli:
@@ -37,7 +37,6 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        #os: ["ubuntu-latest"]
         version: [20]
 
     runs-on: ${{ matrix.os }}

diff --git a/pipelines/azure-build-ts.yml b/pipelines/azure-build-ts.yml
@@ -38,16 +38,16 @@ jobs:
         displayName: "Checkout TypeAgent Repository"
         path: "typeagent"
 
-      - template: include-install-pnpm.yml
-        parameters:
-          buildDirectory: $(Build.SourcesDirectory)/ts
-
       - task: UseNode@1
         displayName: "Setup Node.js"
         inputs:
           version: $(nodeVersion)
           checkLatest: true
 
+      - template: include-install-pnpm.yml
+        parameters:
+          buildDirectory: $(Build.SourcesDirectory)/ts
+
       - script: |
           pnpm install --frozen-lockfile --strict-peer-dependencies
         displayName: "Install dependencies"

diff --git a/pipelines/include-install-pnpm.yml b/pipelines/include-install-pnpm.yml
@@ -45,6 +45,7 @@ steps:
       # workspace-concurrency 0 means use use the CPU core count. This is better than the default (4) for larger agents.
       script: |
         echo "Using node $(node --version)"
+        npm install -g [email protected]
         sudo corepack enable
         echo "Using pnpm $(pnpm -v)"
         pnpm config set store-dir ${{ parameters.pnpmStorePath }}

diff --git a/ts/Dockerfile b/ts/Dockerfile
@@ -2,6 +2,7 @@ FROM node:20 AS base
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
+RUN npm install -g [email protected]
 RUN corepack enable
 
 # Install dependencies required for Chrome/Puppeteer

diff --git a/ts/package.json b/ts/package.json
@@ -48,7 +48,7 @@
     "prettier": "^3.2.5",
     "shx": "^0.3.4"
   },
-  "packageManager": "[email protected].4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0",
+  "packageManager": "[email protected].5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4",
   "engines": {
     "node": ">=18",
     "pnpm": ">=9"