Pipeline use pnpm version specified in packageManager field in packag…

…e.json (#538)
microsoft · Jan 9, 2025 · fd2a9cf · fd2a9cf
1 parent 182ce69
commit fd2a9cf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/.github/workflows/build-docker-container.yml b/.github/workflows/build-docker-container.yml
@@ -16,14 +16,13 @@ permissions:
   contents: read
 
 jobs:
-
   deploy:
-    runs-on: ubuntu-latest # pnpm deploy does not work currently on Windows. Fails with EPERM. 
-    steps: 
+    runs-on: ubuntu-latest # pnpm deploy does not work currently on Windows. Fails with EPERM.
+    steps:
       - name: Setup Git LF
         run: |
           git config --global core.autocrlf false
-          
+
       - uses: actions/checkout@v4
         with:
           ref: main
@@ -35,14 +34,13 @@ jobs:
             ts:
               - "ts/**"
               - ".github/workflows/build-ts.yml"
-              
+
       - uses: pnpm/action-setup@v4
         if: ${{ github.event_name != 'pull_request' || steps.filter.outputs.ts == 'true' }}
         name: Install pnpm
         with:
-          version: 9
-          run_install: false
-
+          package_json_file: ts/package.json
+
       - uses: actions/setup-node@v4
         if: ${{ github.event_name != 'pull_request' || steps.filter.outputs.ts == 'true' }}
         with:
@@ -55,11 +53,9 @@ jobs:
         with:
           client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_5B0D2D6BA40F4710B45721D2112356DD }}
           tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_39BB903136F14B6EAD8F53A8AB78E3AA }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_F36C1F2C4B2C49CA8DD5C52FAB98FA30 }}           
-        
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_F36C1F2C4B2C49CA8DD5C52FAB98FA30 }}
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3    
-        
+        uses: docker/setup-buildx-action@v3
+
       - run: az acr build -t typeagent:latest -r typeagentContainerRegistry --file ${{ github.workspace }}/ts/Dockerfile --subscription b64471de-f2ac-4075-a3cb-7656bca768d0 ${{ github.workspace }}/ts
-
-
diff --git a/.github/workflows/build-ts.yml b/.github/workflows/build-ts.yml
@@ -57,8 +57,7 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || steps.filter.outputs.ts == 'true' }}
         name: Install pnpm
         with:
-          version: 9
-          run_install: false
+          package_json_file: ts/package.json
       - uses: actions/setup-node@v4
         if: ${{ github.event_name != 'pull_request' || steps.filter.outputs.ts == 'true' }}
         with:

diff --git a/.github/workflows/repo-policy-check.yml b/.github/workflows/repo-policy-check.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9
+          package_json_file: ts/package.json
           run_install: |
             - args: [--frozen-lockfile, --strict-peer-dependencies, --ignore-scripts]
               cwd: ts

diff --git a/ts/packages/agentSdk/src/display.ts b/ts/packages/agentSdk/src/display.ts
@@ -19,7 +19,7 @@ export type DynamicDisplay = {
 export type MessageContent = string | string[] | string[][];
 
 export type DisplayContent =
-    | MessageContent // each string in the MessageContext is treated as DisplayType "text"
+    | MessageContent // each string in the MessageContent is treated as DisplayType "text"
     | {
           type: DisplayType; // Type of the content
           content: MessageContent; // each string in the MessageContext is treated as what `type` specifies