Skip to content

Commit

Permalink
Merge branch 'main' into nick/manual-idfilter-changing
Browse files Browse the repository at this point in the history
  • Loading branch information
nick4598 authored Jan 2, 2025
2 parents f7c6c7a + d76e0f2 commit 1318721
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/generate-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ stages:
versionSpec: 18
checkLatest: true

- script: npm install -g pnpm@7.27.0
- script: npm install -g pnpm@9.14.2
displayName: Install pnpm

- script: pnpm install
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 7.27.0
version: 9.14.2

- name: Use Node.js 18
- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 20.18.1
cache: 'pnpm'

- name: Install dependencies
Expand All @@ -46,12 +46,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 7.27.0
version: 9.14.2

- name: Use Node.js 18
- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 20.18.1
cache: 'pnpm'

- id: set-matrix
Expand Down Expand Up @@ -102,12 +102,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 7.27.0
version: 9.14.2

- name: Use Node.js 18
- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 20.18.1
cache: 'pnpm'

- name: Force dependency resolution
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/extract-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 7.27.0
version: 9.14.2

- name: Use Node.js 18
- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 20.18.1
cache: 'pnpm'

- name: Pnpm install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 7.27.0
version: 9.14.2

- name: Use Node.js 18
- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 20.18.1
registry-url: https://registry.npmjs.org/

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
with:
version: 7.33.2

- name: Use Node.js 18
- name: Use Node.js 20
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 20.18.1
registry-url: https://registry.npmjs.org/

- name: Install dependencies
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,5 @@
"overrides": {
"semver": "^7.5.2"
}
},
"packageManager": "[email protected]+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387"
}
}

0 comments on commit 1318721

Please sign in to comment.