Skip to content

Commit 276e98b

Browse files
authored
Merge branch 'main' into sync-eng/common-copilot/update-npm-url-replacement-logic-13307
2 parents 2175b9d + 9ec8b72 commit 276e98b

File tree

4 files changed

+38
-40
lines changed

4 files changed

+38
-40
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,11 @@
269269
# AzureSdkOwners: @samvaity
270270
# ServiceOwners: @assafi
271271

272+
# PRLabel: %Cognitive - Translator
273+
/sdk/translation/ @jrjrguo @SG-MS @Azure/azure-java-sdk
274+
272275
# ServiceLabel: %Cognitive - Translator
273-
# ServiceOwners: @swmachan @MikeyMCZ
276+
# ServiceOwners: @swmachan @jrjrguo @SG-MS
274277

275278
# ServiceLabel: %Commerce
276279
# ServiceOwners: @ms-premp @qiaozha
@@ -844,12 +847,6 @@
844847
# AzureSdkOwners: @jairmyree
845848
# ServiceOwners: @klaaslanghout
846849

847-
# PRLabel: %Text Translation
848-
/sdk/translation/azure-ai-translation-text/ @MikeyMCZ @Azure/azure-java-sdk
849-
850-
# ServiceLabel: %Text Translation
851-
# ServiceOwners: @MikeyMCZ
852-
853850
# ServiceLabel: %TimeseriesInsights
854851
# ServiceOwners: @Shipra1Mishra
855852

.github/copilot-instructions.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ The Azure SDK for Java repository contains client libraries for Azure services,
2525
### Prerequisites
2626

2727
- To use Azure MCP tool calls, users must have PowerShell installed. Provide [PowerShell installation instructions](https://learn.microsoft.com/powershell/scripting/install/installing-powershell) if not installed, and recommend restarting the IDE to start the MCP server.
28-
- Always run the [`azsdk_verify_setup`](../eng/common/instructions/azsdk-tools/verify-setup.instructions.md) tool to check the user's development environment setup for using SDK MCP tools. DO NOT PROCEED with running other tools before completing this step. Only skip for queries that don't need tools.
28+
- When using Copilot from Visual Studio or VS Code (not applicable when using Coding Agent on Github.com):
29+
- **Always run** the [`azsdk_verify_setup`](../eng/common/instructions/azsdk-tools/verify-setup.instructions.md) tool first to validate the user's development environment for SDK MCP tools.
30+
- **Do not proceed** with any other tool execution until this step is complete.
31+
- **Skip this check only** for queries that do not require tool execution.
2932

3033
## Behavior
3134

eng/common/pipelines/ai-evals-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
trigger: none
2-
3-
pr:
1+
trigger:
42
branches:
53
include:
64
- main
@@ -9,6 +7,8 @@ pr:
97
- .github/copilot-instructions.md
108
- eng/common/instructions/azsdk-tools/**
119

10+
pr: none
11+
1212
parameters:
1313
- name: EvalProject
1414
type: string
@@ -45,4 +45,4 @@ extends:
4545
EvalRepoCommit: ${{ parameters.EvalRepoCommit }}
4646
TargetRepoOwner: $(TargetRepoOwner)
4747
TargetRepoName: $(TargetRepoName)
48-
TargetRepoCommit: $(TargetRepoCommit)
48+
TargetRepoCommit: $(TargetRepoCommit)

eng/common/pipelines/templates/steps/create-apireview.yml

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,29 @@ steps:
3737
parameters:
3838
WorkingDirectory: ${{ parameters.SourceRootPath }}
3939

40-
- task: AzureCLI@2
41-
inputs:
42-
azureSubscription: 'APIView prod deployment'
43-
scriptType: pscore
44-
scriptLocation: scriptPath
45-
scriptPath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
46-
# PackageInfoFiles example: @('a/file1.json','a/file2.json')
47-
arguments: >
48-
-PackageInfoFiles @('${{ join(''',''', parameters.PackageInfoFiles) }}')
49-
-ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
50-
-ArtifactPath '${{parameters.ArtifactPath}}'
51-
-ArtifactName ${{ parameters.ArtifactName }}
52-
-PackageName '${{parameters.PackageName}}'
53-
-SourceBranch '$(Build.SourceBranchName)'
54-
-DefaultBranch '$(DefaultBranch)'
55-
-ConfigFileDir '${{parameters.ConfigFileDir}}'
56-
-BuildId '$(Build.BuildId)'
57-
-RepoName '$(Build.Repository.Name)'
58-
-MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
59-
displayName: Create API Review
60-
condition: >-
61-
and(
62-
succeededOrFailed(),
63-
ne(variables['Skip.CreateApiReview'], 'true'),
64-
ne(variables['Build.Reason'],'PullRequest'),
65-
eq(variables['System.TeamProject'], 'internal'),
66-
not(endsWith(variables['Build.Repository.Name'], '-pr'))
67-
)
40+
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest'), not(endsWith(variables['Build.Repository.Name'], '-pr'))) }}:
41+
- task: AzureCLI@2
42+
inputs:
43+
azureSubscription: 'APIView prod deployment'
44+
scriptType: pscore
45+
scriptLocation: scriptPath
46+
scriptPath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
47+
# PackageInfoFiles example: @('a/file1.json','a/file2.json')
48+
arguments: >
49+
-PackageInfoFiles @('${{ join(''',''', parameters.PackageInfoFiles) }}')
50+
-ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
51+
-ArtifactPath '${{parameters.ArtifactPath}}'
52+
-ArtifactName ${{ parameters.ArtifactName }}
53+
-PackageName '${{parameters.PackageName}}'
54+
-SourceBranch '$(Build.SourceBranchName)'
55+
-DefaultBranch '$(DefaultBranch)'
56+
-ConfigFileDir '${{parameters.ConfigFileDir}}'
57+
-BuildId '$(Build.BuildId)'
58+
-RepoName '$(Build.Repository.Name)'
59+
-MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
60+
displayName: Create API Review
61+
condition: >-
62+
and(
63+
succeededOrFailed(),
64+
ne(variables['Skip.CreateApiReview'], 'true')
65+
)

0 commit comments

Comments
 (0)