diff --git a/eng/pipelines/templates/steps/npm-install.yml b/eng/pipelines/templates/steps/npm-install.yml index 6ea32a5642da..f7ddf8e49df2 100644 --- a/eng/pipelines/templates/steps/npm-install.yml +++ b/eng/pipelines/templates/steps/npm-install.yml @@ -2,8 +2,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 diff --git a/eng/pipelines/typespec-validation-all.yml b/eng/pipelines/typespec-validation-all.yml index 305d5b8de581..88d5213f355a 100644 --- a/eng/pipelines/typespec-validation-all.yml +++ b/eng/pipelines/typespec-validation-all.yml @@ -36,6 +36,9 @@ jobs: vmImage: $(OSVmImage) steps: + - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge origin/main + displayName: git merge origin/main + - template: /eng/pipelines/templates/steps/npm-install.yml - pwsh: | diff --git a/eng/pipelines/typespec-validation.yml b/eng/pipelines/typespec-validation.yml index f394233a5325..a717d9821953 100644 --- a/eng/pipelines/typespec-validation.yml +++ b/eng/pipelines/typespec-validation.yml @@ -7,6 +7,9 @@ jobs: vmImage: ubuntu-22.04 steps: + - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge origin/main + displayName: git merge origin/main + - template: /eng/pipelines/templates/steps/npm-install.yml - pwsh: | diff --git a/package.json b/package.json index df56d8f7acf6..beb2296b48bb 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-apiview": "0.4.4", - "@azure-tools/typespec-autorest": "0.35.0", - "@azure-tools/typespec-azure-core": "0.35.0", - "@azure-tools/typespec-azure-resource-manager": "0.35.0", - "@azure-tools/typespec-client-generator-core": "0.35.0", - "@azure-tools/typespec-providerhub": "0.35.0", - "@typespec/compiler": "0.49.0", - "@typespec/http": "0.49.0", - "@typespec/openapi": "0.49.0", - "@typespec/rest": "0.49.0", - "@typespec/versioning": "0.49.0", + "@azure-tools/typespec-autorest": "next", + "@azure-tools/typespec-azure-core": "next", + "@azure-tools/typespec-azure-resource-manager": "next", + "@azure-tools/typespec-client-generator-core": "next", + "@azure-tools/typespec-providerhub": "next", + "@typespec/compiler": "next", + "@typespec/http": "next", + "@typespec/lint": "next", + "@typespec/openapi": "next", + "@typespec/rest": "next", + "@typespec/versioning": "next", "@azure/avocado": "^0.8.4", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3",