Skip to content

Commit

Permalink
Update package.json, pipelines, and actions
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeharder committed Dec 9, 2024
1 parent 2bde125 commit 1536205
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 20 deletions.
9 changes: 9 additions & 0 deletions .github/actions/setup-node-npm-ci/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ runs:
with:
node-version: ${{ inputs.node-version }}

- name: Regenerate package-lock.json with latest "next" versions
run: |
rm package-lock.json
npm install --package-lock-only
echo "::group::echo package-lock.json"
cat package-lock.json
echo "::endgroup::"
shell: bash

- run: |
echo "::group::npm ci"
npm ci
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/typespec-validation-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ jobs:
with:
# Convert placeholder string 'default' to '', which tells the action to checkout the default ref.
ref: ${{ matrix.ref == 'next' && 'typespec-next' || '' }}
# Checkout all history for all branches. Required to merge origin/main.
fetch-depth: 0

- name: git merge origin/main
run: git -c user.name="azure-sdk" -c user.email="[email protected]" merge -Xours origin/main

- name: Setup Node and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/typespec-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
# Checkout all history for all branches. Required to merge origin/main.
fetch-depth: 0

- name: git merge origin/main
run: git -c user.name="azure-sdk" -c user.email="[email protected]" merge -Xours origin/main

- name: Setup Node and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/steps/npm-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ steps:
- script: npm --version --loglevel info
displayName: npm --version

- script: npm ci
displayName: npm ci
- script: npm install --no-package-lock
displayName: npm install --no-package-lock

- script: npm ls -a
displayName: npm ls -a
Expand Down
30 changes: 13 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
{
"name": "azure-rest-api-specs",
"devDependencies": {
"@azure-tools/typespec-apiview": "0.4.9",
"@azure-tools/typespec-autorest": "0.48.0",
"@azure-tools/typespec-azure-core": "0.48.0",
"@azure-tools/typespec-azure-portal-core": "0.48.0",
"@azure-tools/typespec-azure-resource-manager": "0.48.0",
"@azure-tools/typespec-azure-rulesets": "0.48.0",
"@azure-tools/typespec-client-generator-cli": "0.14.2",
"@azure-tools/typespec-client-generator-core": "0.48.4",
"@azure-tools/typespec-liftr-base": "0.6.0",
"@azure-tools/typespec-autorest": "next",
"@azure-tools/typespec-azure-core": "next",
"@azure-tools/typespec-azure-portal-core": "next",
"@azure-tools/typespec-azure-resource-manager": "next",
"@azure-tools/typespec-azure-rulesets": "next",
"@azure-tools/typespec-client-generator-core": "next",
"@azure-tools/typespec-liftr-base": "0.4.0",
"@azure/avocado": "^0.9.1",
"@typespec/compiler": "0.62.0",
"@typespec/http": "0.62.0",
"@typespec/openapi": "0.62.0",
"@typespec/openapi3": "0.62.0",
"@typespec/prettier-plugin-typespec": "0.62.0",
"@typespec/rest": "0.62.0",
"@typespec/streams": "0.62.0",
"@typespec/versioning": "0.62.0",
"@typespec/compiler": "next",
"@typespec/http": "next",
"@typespec/openapi": "next",
"@typespec/openapi3": "next",
"@typespec/rest": "next",
"@typespec/versioning": "next",
"azure-rest-api-specs-eng-tools": "file:eng/tools",
"oav": "^3.5.1",
"prettier": "~3.3.3",
Expand Down

0 comments on commit 1536205

Please sign in to comment.