Skip to content

Check validation with azureLocation fix #36575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: typespec-next
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-node-install-deps/action.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name: Setup Node and install dependencies
description: Uses specified Node version and installs dependencies (typically using "npm")

Expand All @@ -7,7 +7,7 @@
default: 22.x
install-command:
description: "Command to install dependencies"
default: "npm ci"
default: "npm install --no-package-lock --force"
working-directory:
description: "Working directory"
default: "."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typespec-validation-all.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name: TypeSpec Validation - All

on:
Expand Down Expand Up @@ -74,7 +74,7 @@

- name: git merge origin/main
run: |
git merge --no-commit -Xours origin/main
git -c user.name="azure-sdk" -c user.email="[email protected]" merge --no-commit -Xours origin/main
git -c user.name="azure-sdk" -c user.email="[email protected]" commit --allow-empty -m "Merge origin/main"

- name: Setup Node and install deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typespec-validation.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name: TypeSpec Validation

on: pull_request
Expand All @@ -18,7 +18,7 @@

- name: git merge origin/main
run: |
git merge --no-commit -Xours origin/main
git -c user.name="azure-sdk" -c user.email="[email protected]" merge --no-commit -Xours origin/main
git -c user.name="azure-sdk" -c user.email="[email protected]" commit --allow-empty -m "Merge origin/main"

- name: Setup Node and install deps
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
@@ -1,3 +1,3 @@
parameters:
- name: NodeVersion
type: string
Expand All @@ -11,8 +11,8 @@
parameters:
NodeVersion: ${{ parameters.NodeVersion }}

- script: npm install --no-package-lock
displayName: npm install --no-package-lock
- script: npm install --no-package-lock --force
displayName: npm install --no-package-lock --force
workingDirectory: ${{ parameters.WorkingDirectory }}

- script: npm ls -a || true
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "azure-rest-api-specs",
"devDependencies": {
Expand All @@ -7,7 +7,7 @@
"@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-resource-manager": "https://pkg.pr.new/Azure/typespec-azure/@azure-tools/typespec-azure-resource-manager@3138",
"@azure-tools/typespec-azure-rulesets": "next",
"@azure-tools/typespec-client-generator-cli": "0.27.0",
"@azure-tools/typespec-client-generator-core": "next",
Expand All @@ -34,7 +34,7 @@
"@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-resource-manager": "https://pkg.pr.new/Azure/typespec-azure/@azure-tools/typespec-azure-resource-manager@3138",
"@azure-tools/typespec-client-generator-core": "next",
"@azure-tools/typespec-azure-rulesets": "next",
"@typespec/asset-emitter": "next",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2809,6 +2809,10 @@
"type": "string",
"description": "Represents an Azure Resource Type."
},
"Azure.Core.azureLocation": {
"type": "string",
"description": "Represents an Azure geography region where supported resource providers live."
},
"Connection": {
"type": "object",
"description": "The connection resource definition.",
Expand Down Expand Up @@ -3811,7 +3815,7 @@
}
},
"location": {
"type": "string",
"$ref": "#/definitions/Azure.Core.azureLocation",
"description": "The geo-location where the resource lives",
"x-ms-mutability": [
"read",
Expand Down Expand Up @@ -4047,7 +4051,7 @@
}
},
"location": {
"type": "string",
"$ref": "#/definitions/Azure.Core.azureLocation",
"description": "The geo-location where the resource lives",
"x-ms-mutability": [
"read",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2809,6 +2809,10 @@
"type": "string",
"description": "Represents an Azure Resource Type."
},
"Azure.Core.azureLocation": {
"type": "string",
"description": "Represents an Azure geography region where supported resource providers live."
},
"Connection": {
"type": "object",
"description": "The connection resource definition.",
Expand Down Expand Up @@ -3811,7 +3815,7 @@
}
},
"location": {
"type": "string",
"$ref": "#/definitions/Azure.Core.azureLocation",
"description": "The geo-location where the resource lives",
"x-ms-mutability": [
"read",
Expand Down Expand Up @@ -4047,7 +4051,7 @@
}
},
"location": {
"type": "string",
"$ref": "#/definitions/Azure.Core.azureLocation",
"description": "The geo-location where the resource lives",
"x-ms-mutability": [
"read",
Expand Down
Loading