Skip to content

Commit a7e6a20

Browse files
authored
Use node 13 for CodeGeneration and merge pipelines (#14989)
1 parent 350a683 commit a7e6a20

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

eng/Directory.Build.Data.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ValidateReleaseNotesScriptPath Condition=" '$(ValidateReleaseNotesScriptPath)'=='' ">$(MSBuildThisFileDirectory)common/scripts/Verify-ChangeLog.ps1</ValidateReleaseNotesScriptPath>
3030
<ChangeLogPath>$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory)/../))CHANGELOG.md</ChangeLogPath>
3131
</PropertyGroup>
32-
<Exec ContinueOnError="true" ConsoleToMSBuild="true" Command="$(PowerShellExe) -NoProfile -NonInteractive -executionpolicy Unrestricted -File $(ValidateReleaseNotesScriptPath) -ChangeLogLocation $(ChangeLogPath) -VersionString $(_VersionInProject)">
32+
<Exec ContinueOnError="true" ConsoleToMSBuild="true" StandardOutputImportance="Low" Command="$(PowerShellExe) -NoProfile -NonInteractive -executionpolicy Unrestricted -File $(ValidateReleaseNotesScriptPath) -ChangeLogLocation $(ChangeLogPath) -VersionString $(_VersionInProject)">
3333
<Output TaskParameter="ExitCode" PropertyName="SetReleaseNotesErrorCode" />
3434
</Exec>
3535
<Error Condition="'$(SetReleaseNotesErrorCode)' != '0'" Text="No entry for version [$(_VersionInProject)] found in the ChangeLog [$(ChangeLogPath)]. " />
@@ -175,7 +175,7 @@
175175
Text="When UseProjectReferenceToAzureClients=true all Azure.* references should be Project References, but the following are not [@(ShouldBeProjectReference)]" />
176176
</Target>
177177

178-
<Target Name="RunApiCompat" AfterTargets="CoreBuild" Condition="'$(ApiCompatVersion)' != '' and '$(DesignTimeBuild)' != 'true'">
178+
<Target Name="RunApiCompat" AfterTargets="CoreBuild" Condition="'$(ApiCompatVersion)' != '' and '$(DesignTimeBuild)' != 'true' and '$(SkipApiCompat)' != 'true'">
179179
<MSBuild
180180
Projects="$(MSBuildThisFileDirectory)/ApiCompat/ApiCompat.csproj"
181181
Properties="TargetPackageName=$(PackageId);

eng/pipelines/templates/jobs/archetype-sdk-client.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ jobs:
5353
condition: ne(variables['Skip.Analyze'], true)
5454
variables:
5555
- template: ../variables/globals.yml
56-
dependsOn:
57-
- Build
5856
pool:
59-
vmImage: "windows-2019"
57+
vmImage: ubuntu-18.04
6058
steps:
6159
- task: UsePythonVersion@0
6260
displayName: "Use Python 3.6"
@@ -73,17 +71,9 @@ jobs:
7371
- template: /eng/common/pipelines/templates/steps/verify-path-length.yml
7472
parameters:
7573
SourceDirectory: $(Build.SourcesDirectory)
76-
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
77-
displayName: "Component Detection"
78-
# ComponentGovernance is currently unable to run on pull requests of public projects. Running on
79-
# scheduled builds should be good enough.
80-
inputs:
81-
ignoreDirectories: "sdk/storage/Azure.Storage.Common/swagger/Generator"
82-
condition: and(succeededOrFailed(), ne(variables['Build.Reason'],'PullRequest'))
8374
- task: NodeTool@0
8475
inputs:
85-
# AutoRest doesn't work with versions 12.x
86-
versionSpec: '10.15.0'
76+
versionSpec: '13.13.0'
8777
displayName: 'Install NodeJS'
8878
- task: PowerShell@2
8979
displayName: "Verify generated code"
@@ -96,6 +86,13 @@ jobs:
9686
arguments: -ServiceDirectory ${{parameters.ServiceToBuild}}
9787
pwsh: true
9888
failOnStderr: false
89+
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
90+
displayName: "Component Detection"
91+
# ComponentGovernance is currently unable to run on pull requests of public projects. Running on
92+
# scheduled builds should be good enough.
93+
inputs:
94+
ignoreDirectories: "sdk/storage/Azure.Storage.Common/swagger/Generator"
95+
condition: and(succeededOrFailed(), ne(variables['Build.Reason'],'PullRequest'))
9996
- job: "Test"
10097
condition: ne(variables['Skip.Test'], true)
10198
variables:

eng/scripts/Export-API.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ param (
77

88
$servicesProj = Resolve-Path "$PSScriptRoot/../service.proj"
99

10-
dotnet build /p:GenerateApiListingOnBuild=true /p:Configuration=Release /p:IncludeSamples=false /p:IncludeTests=false /p:Scope="$ServiceDirectory" /restore $servicesProj
10+
dotnet build /p:GenerateApiListingOnBuild=true /p:SkipApiCompat=true /p:GeneratePackageOnBuild=false /p:Configuration=Release /p:IncludeSamples=false /p:IncludeTests=false /p:Scope="$ServiceDirectory" /restore $servicesProj

0 commit comments

Comments
 (0)