fix pipeline error

microsoft · Nov 22, 2023 · eac8810 · eac8810
1 parent 4fa43cb
commit eac8810
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 25 deletions.
diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml
@@ -30,23 +30,23 @@ runs:
           ${{ runner.os }}-pip-build-vsix-
 
     # For faster/better builds of sdists.
-    - name: Update pip, install pipx and install wheel
-      run: python -m pip install -U pip pipx wheel
+    - name: Update pip, install nox and install wheel
+      run: python -m pip install -U pip nox wheel
       shell: bash
 
     - name: Run npm ci
       run: npm ci --prefer-offline
       shell: bash
 
     - name: Install bundled python libraries
-      run: pipx run nox --session install_bundled_libs
+      run: python -m nox --session install_bundled_libs
       shell: bash
 
     # Use the GITHUB_RUN_ID environment variable to update the build number.
     # GITHUB_RUN_ID is a unique number for each run within a repository.
     # This number does not change if you re-run the workflow run.
     - name: Update extension build number
-      run: pipx run nox --session update_build_number -- $GITHUB_RUN_ID
+      run: python -m nox --session update_build_number -- $GITHUB_RUN_ID
       shell: bash
 
     - name: Build VSIX

diff --git a/.github/actions/lint/action.yml b/.github/actions/lint/action.yml
@@ -41,15 +41,15 @@ runs:
           ${{ runner.os }}-pip-lint-
 
     # For faster/better builds of sdists.
-    - name: Update pip, install pipx and install wheel
-      run: python -m pip install -U pip pipx wheel
+    - name: Update pip, install nox and install wheel
+      run: python -m pip install -U pip nox wheel
       shell: bash
 
     # This will install libraries to a target directory.
     - name: Install bundled python libraries
-      run: pipx run nox --session install_bundled_libs
+      run: python -m nox --session install_bundled_libs
       shell: bash
 
     - name: Check linting and formatting
-      run: pipx run nox --session lint
+      run: python -m nox --session lint
       shell: bash
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -58,13 +58,13 @@ jobs:
         with:
           python-version: '3.7'
 
-      - name: Update pip, install pipx and install wheel
-        run: python -m pip install -U pip pipx wheel
+      - name: Update pip, install nox and install wheel
+        run: python -m pip install -U pip nox wheel
         shell: bash
 
       # This will install libraries to a target directory.
       - name: Install bundled python libraries
-        run: pipx run nox --session install_bundled_libs
+        run: python -m nox --session install_bundled_libs
         shell: bash
 
       - name: Install Node
@@ -85,8 +85,8 @@ jobs:
           python-version: ${{ matrix.python }}
 
       # The new python may not have nox so install it again
-      - name: Update pip, install pipx and install wheel (again)
-        run: python -m pip install -U pip pipx wheel
+      - name: Update pip, install nox and install wheel (again)
+        run: python -m pip install -U pip nox wheel
         shell: bash
 
       - name: Start xvfb on Linux
@@ -97,7 +97,7 @@ jobs:
         if: ${{ runner.os }} == 'Linux'
 
       - name: Run tests
-        run: pipx run nox --session tests
+        run: python -m nox --session tests
         shell: bash
         env:
           DISPLAY: ${{ env.DISPLAY }}
diff --git a/.github/workflows/push-check.yml b/.github/workflows/push-check.yml
@@ -63,13 +63,13 @@ jobs:
         with:
           python-version: '3.7'
 
-      - name: Update pip, install pipx and install wheel
-        run: python -m pip install -U pip pipx wheel
+      - name: Update pip, install nox and install wheel
+        run: python -m pip install -U pip nox wheel
         shell: bash
 
       # This will install libraries to a target directory.
       - name: Install bundled python libraries
-        run: pipx run nox --session install_bundled_libs
+        run: python -m nox --session install_bundled_libs
         shell: bash
 
       - name: Install Node
@@ -90,8 +90,8 @@ jobs:
           python-version: ${{ matrix.python }}
 
       # The new python may not have nox so install it again
-      - name: Update pip, install pipx and install wheel (again)
-        run: python -m pip install -U pip pipx wheel
+      - name: Update pip, install nox and install wheel (again)
+        run: python -m pip install -U pip nox wheel
         shell: bash
 
       - name: Start xvfb on Linux
@@ -102,5 +102,5 @@ jobs:
         if: ${{ runner.os }} == 'Linux'
 
       - name: Run tests
-        run: pipx run nox --session tests
+        run: python -m nox --session tests
         shell: bash
diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml
@@ -24,6 +24,32 @@ extends:
   template: azure-pipelines/extension/stable.yml@templates
   parameters:
     l10nSourcePaths: ./src
+    buildPlatforms:
+      - name: Linux
+        packageArch: arm64
+        vsceTarget: linux-arm64
+      - name: Linux
+        packageArch: arm
+        vsceTarget: linux-armhf
+      - name: Linux
+        packageArch: x64
+        vsceTarget: linux-x64
+      - name: MacOS
+        packageArch: arm64
+        vsceTarget: darwin-arm64
+      - name: MacOS
+        packageArch: x64
+        vsceTarget: darwin-x64
+      - name: Windows
+        packageArch: arm
+        vsceTarget: win32-arm64
+      - name: Windows
+        packageArch: ia32
+        vsceTarget: win32-ia32
+      - name: Windows
+        packageArch: x64
+        vsceTarget: win32-x64
+
     publishExtension: ${{ parameters.publishExtension }}
     buildSteps:
       - task: NodeTool@0
@@ -44,14 +70,14 @@ extends:
       - script: python -m pip install -U pip
         displayName: Upgrade pip
 
-      - script: python -m pip install wheel
-        displayName: Install wheel
-
-      - script: python -m pip install nox
-        displayName: Install wheel
+      - script: python -m pip install wheel nox
+        displayName: Install wheel and nox
 
+      # update according packageArch
       - script: python -m nox --session install_bundled_libs
         displayName: Install Python dependencies
+        env:
+          VSCETARGET: ${{ variables.VSCETARGET }}
 
       - script: python ./build/update_ext_version.py --release --for-publishing
         displayName: Update build number