Skip to content

Commit eac8810

Browse files
fix pipeline error
1 parent 4fa43cb commit eac8810

File tree

5 files changed

+51
-25
lines changed

5 files changed

+51
-25
lines changed

.github/actions/build-vsix/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ runs:
3030
${{ runner.os }}-pip-build-vsix-
3131
3232
# For faster/better builds of sdists.
33-
- name: Update pip, install pipx and install wheel
34-
run: python -m pip install -U pip pipx wheel
33+
- name: Update pip, install nox and install wheel
34+
run: python -m pip install -U pip nox wheel
3535
shell: bash
3636

3737
- name: Run npm ci
3838
run: npm ci --prefer-offline
3939
shell: bash
4040

4141
- name: Install bundled python libraries
42-
run: pipx run nox --session install_bundled_libs
42+
run: python -m nox --session install_bundled_libs
4343
shell: bash
4444

4545
# Use the GITHUB_RUN_ID environment variable to update the build number.
4646
# GITHUB_RUN_ID is a unique number for each run within a repository.
4747
# This number does not change if you re-run the workflow run.
4848
- name: Update extension build number
49-
run: pipx run nox --session update_build_number -- $GITHUB_RUN_ID
49+
run: python -m nox --session update_build_number -- $GITHUB_RUN_ID
5050
shell: bash
5151

5252
- name: Build VSIX

.github/actions/lint/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ runs:
4141
${{ runner.os }}-pip-lint-
4242
4343
# For faster/better builds of sdists.
44-
- name: Update pip, install pipx and install wheel
45-
run: python -m pip install -U pip pipx wheel
44+
- name: Update pip, install nox and install wheel
45+
run: python -m pip install -U pip nox wheel
4646
shell: bash
4747

4848
# This will install libraries to a target directory.
4949
- name: Install bundled python libraries
50-
run: pipx run nox --session install_bundled_libs
50+
run: python -m nox --session install_bundled_libs
5151
shell: bash
5252

5353
- name: Check linting and formatting
54-
run: pipx run nox --session lint
54+
run: python -m nox --session lint
5555
shell: bash

.github/workflows/pr-check.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
with:
5959
python-version: '3.7'
6060

61-
- name: Update pip, install pipx and install wheel
62-
run: python -m pip install -U pip pipx wheel
61+
- name: Update pip, install nox and install wheel
62+
run: python -m pip install -U pip nox wheel
6363
shell: bash
6464

6565
# This will install libraries to a target directory.
6666
- name: Install bundled python libraries
67-
run: pipx run nox --session install_bundled_libs
67+
run: python -m nox --session install_bundled_libs
6868
shell: bash
6969

7070
- name: Install Node
@@ -85,8 +85,8 @@ jobs:
8585
python-version: ${{ matrix.python }}
8686

8787
# The new python may not have nox so install it again
88-
- name: Update pip, install pipx and install wheel (again)
89-
run: python -m pip install -U pip pipx wheel
88+
- name: Update pip, install nox and install wheel (again)
89+
run: python -m pip install -U pip nox wheel
9090
shell: bash
9191

9292
- name: Start xvfb on Linux
@@ -97,7 +97,7 @@ jobs:
9797
if: ${{ runner.os }} == 'Linux'
9898

9999
- name: Run tests
100-
run: pipx run nox --session tests
100+
run: python -m nox --session tests
101101
shell: bash
102102
env:
103103
DISPLAY: ${{ env.DISPLAY }}

.github/workflows/push-check.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ jobs:
6363
with:
6464
python-version: '3.7'
6565

66-
- name: Update pip, install pipx and install wheel
67-
run: python -m pip install -U pip pipx wheel
66+
- name: Update pip, install nox and install wheel
67+
run: python -m pip install -U pip nox wheel
6868
shell: bash
6969

7070
# This will install libraries to a target directory.
7171
- name: Install bundled python libraries
72-
run: pipx run nox --session install_bundled_libs
72+
run: python -m nox --session install_bundled_libs
7373
shell: bash
7474

7575
- name: Install Node
@@ -90,8 +90,8 @@ jobs:
9090
python-version: ${{ matrix.python }}
9191

9292
# The new python may not have nox so install it again
93-
- name: Update pip, install pipx and install wheel (again)
94-
run: python -m pip install -U pip pipx wheel
93+
- name: Update pip, install nox and install wheel (again)
94+
run: python -m pip install -U pip nox wheel
9595
shell: bash
9696

9797
- name: Start xvfb on Linux
@@ -102,5 +102,5 @@ jobs:
102102
if: ${{ runner.os }} == 'Linux'
103103

104104
- name: Run tests
105-
run: pipx run nox --session tests
105+
run: python -m nox --session tests
106106
shell: bash

build/azure-pipeline.stable.yml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,32 @@ extends:
2424
template: azure-pipelines/extension/stable.yml@templates
2525
parameters:
2626
l10nSourcePaths: ./src
27+
buildPlatforms:
28+
- name: Linux
29+
packageArch: arm64
30+
vsceTarget: linux-arm64
31+
- name: Linux
32+
packageArch: arm
33+
vsceTarget: linux-armhf
34+
- name: Linux
35+
packageArch: x64
36+
vsceTarget: linux-x64
37+
- name: MacOS
38+
packageArch: arm64
39+
vsceTarget: darwin-arm64
40+
- name: MacOS
41+
packageArch: x64
42+
vsceTarget: darwin-x64
43+
- name: Windows
44+
packageArch: arm
45+
vsceTarget: win32-arm64
46+
- name: Windows
47+
packageArch: ia32
48+
vsceTarget: win32-ia32
49+
- name: Windows
50+
packageArch: x64
51+
vsceTarget: win32-x64
52+
2753
publishExtension: ${{ parameters.publishExtension }}
2854
buildSteps:
2955
- task: NodeTool@0
@@ -44,14 +70,14 @@ extends:
4470
- script: python -m pip install -U pip
4571
displayName: Upgrade pip
4672

47-
- script: python -m pip install wheel
48-
displayName: Install wheel
49-
50-
- script: python -m pip install nox
51-
displayName: Install wheel
73+
- script: python -m pip install wheel nox
74+
displayName: Install wheel and nox
5275

76+
# update according packageArch
5377
- script: python -m nox --session install_bundled_libs
5478
displayName: Install Python dependencies
79+
env:
80+
VSCETARGET: ${{ variables.VSCETARGET }}
5581

5682
- script: python ./build/update_ext_version.py --release --for-publishing
5783
displayName: Update build number

0 commit comments

Comments
 (0)