Skip to content

Commit 72d40f6

Browse files
azure-sdkbenbp
andauthored
Sync eng/common directory with azure-sdk-tools for PR 7892 (#34789)
* Move git check for changes to script * Minor fixes for 1es migration --------- Co-authored-by: Ben Broderick Phillips <[email protected]>
1 parent 21d0ed4 commit 72d40f6

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

eng/common/pipelines/templates/steps/bypass-local-dns.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ steps:
66
condition: |
77
and(
88
succeededOrFailed(),
9-
contains(variables['OSVmImage'], 'ubuntu'),
9+
or(contains(variables['OSVmImage'], 'ubuntu'),contains(variables['OSVmImage'], 'linux')),
1010
eq(variables['Container'], '')
1111
)

eng/common/pipelines/templates/steps/git-push-changes.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,14 @@ parameters:
1010
SkipCheckingForChanges: false
1111

1212
steps:
13-
- pwsh: |
14-
echo "git add -A"
15-
git add -A
16-
17-
echo "git diff --name-status --cached --exit-code"
18-
git diff --name-status --cached --exit-code
19-
20-
if ($LastExitCode -ne 0) {
21-
echo "##vso[task.setvariable variable=HasChanges]$true"
22-
echo "Changes detected so setting HasChanges=true"
23-
}
24-
else {
25-
echo "##vso[task.setvariable variable=HasChanges]$false"
26-
echo "No changes so skipping code push"
27-
}
13+
- task: PowerShell@2
2814
displayName: Check for changes
2915
condition: and(succeeded(), eq(${{ parameters.SkipCheckingForChanges }}, false))
30-
workingDirectory: ${{ parameters.WorkingDirectory }}
31-
ignoreLASTEXITCODE: true
16+
inputs:
17+
pwsh: true
18+
workingDirectory: ${{ parameters.WorkingDirectory }}
19+
filePath: ${{ parameters.ScriptDirectory }}/check-for-git-changes.ps1
20+
ignoreLASTEXITCODE: true
3221

3322
- pwsh: |
3423
# Remove the repo owner from the front of the repo name if it exists there
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
echo "git add -A"
2+
git add -A
3+
4+
echo "git diff --name-status --cached --exit-code"
5+
git diff --name-status --cached --exit-code
6+
7+
if ($LastExitCode -ne 0) {
8+
echo "##vso[task.setvariable variable=HasChanges]$true"
9+
echo "Changes detected so setting HasChanges=true"
10+
}
11+
else {
12+
echo "##vso[task.setvariable variable=HasChanges]$false"
13+
echo "No changes so skipping code push"
14+
}

eng/common/testproxy/publish-proxy-logs.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ parameters:
33

44
steps:
55
- pwsh: |
6-
Copy-Item -Path "${{ parameters.rootFolder }}/test-proxy.log" -Destination "${{ parameters.rootFolder }}/proxy.log"
6+
New-Item -ItemType Directory -Force "${{ parameters.rootFolder }}/proxy-logs"
7+
Copy-Item -Path "${{ parameters.rootFolder }}/test-proxy.log" -Destination "${{ parameters.rootFolder }}/proxy-logs/proxy.log"
78
displayName: Copy Log File
89
condition: succeededOrFailed()
910
1011
- template: ../pipelines/templates/steps/publish-artifact.yml
1112
parameters:
1213
ArtifactName: "$(System.StageName)-$(System.JobName)-$(System.JobAttempt)-proxy-logs"
13-
ArtifactPath: "${{ parameters.rootFolder }}/proxy.log"
14+
ArtifactPath: "${{ parameters.rootFolder }}/proxy-logs"
1415

1516
- pwsh: |
16-
Remove-Item -Force ${{ parameters.rootFolder }}/proxy.log
17+
Remove-Item -Force ${{ parameters.rootFolder }}/proxy-logs/proxy.log
1718
displayName: Cleanup Copied Log File
1819
condition: succeededOrFailed()

0 commit comments

Comments
 (0)