From aeba2bc73ef1f5f629a3aa0203b6ba2d1ebe8901 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Thu, 8 Jul 2021 16:00:28 -0500 Subject: [PATCH 1/9] Generate example --- eng/scripts/build.ps1 | 28 +++++++++++++++++++++------- sdk/agfood/armagfood/autorest.md | 8 ++++++++ sdk/agfood/armagfood/build.go | 4 ++++ 3 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 sdk/agfood/armagfood/autorest.md create mode 100644 sdk/agfood/armagfood/build.go diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1 index e7bf326e2f2d..5d718a6270ff 100644 --- a/eng/scripts/build.ps1 +++ b/eng/scripts/build.ps1 @@ -1,12 +1,19 @@ #Requires -Version 7.0 param($filter, [switch]$vet, [switch]$generate, [switch]$skipBuild, $parallel = 5) +$startingDirectory = Get-Location +$root = Resolve-Path ($PSScriptRoot + "/../..") +Set-Location $root $sdks = @{}; foreach ($sdk in (./eng/scripts/get_module_dirs.ps1 -serviceDir 'sdk/...')) { $name = $sdk | split-path -leaf $sdks[$name] = @{ - 'path' = $sdk; + 'path' = $sdk; + 'vet' = $vet; + 'generate' = $generate; + 'skipBuild' = $skipBuild; + 'root' = $root; } } @@ -19,16 +26,23 @@ if (![string]::IsNullOrWhiteSpace($filter)) { $keys | ForEach-Object { $sdks[$_] } | ForEach-Object -Parallel { Push-Location $_.path - if (!$skipBuild) { + if ($_.generate) { + Write-Host "##[command]Executing autorest.go in " $_.path + $autorestPath = $_.path + "\autorest.md" + $autorestVersion = "@autorest/go@4.0.0-preview.23" + $outputFolder = $_.path + $root = $_.root + autorest --use=$autorestVersion --go --track2 --go-sdk-folder=$root --output-folder=$outputFolder --file-prefix="zz_generated_" --clear-output-folder=false $autorestPath + } + if (!$_.skipBuild) { Write-Host "##[command]Executing go build -v ./... in " $_.path go build -v ./... } - if ($vet) { + if ($_.vet) { Write-Host "##[command]Executing go vet ./... in " $_.path go vet ./... } - if ($generate) { - Write-Host "##[command]Executing autorest.go in " $_.path - # TODO - } + Pop-Location } -ThrottleLimit $parallel + +Set-Location $startingDirectory \ No newline at end of file diff --git a/sdk/agfood/armagfood/autorest.md b/sdk/agfood/armagfood/autorest.md new file mode 100644 index 000000000000..002e18304705 --- /dev/null +++ b/sdk/agfood/armagfood/autorest.md @@ -0,0 +1,8 @@ +### AutoRest Configuration +> see https://aka.ms/autorest + +``` yaml +tag: package-2020-05-12-preview +require: + - https://github.com/Azure/azure-rest-api-specs/blob/9875f8eebd8c1392a83c052bc50a79c8251b1174/specification/agfood/resource-manager/readme.md +``` \ No newline at end of file diff --git a/sdk/agfood/armagfood/build.go b/sdk/agfood/armagfood/build.go new file mode 100644 index 000000000000..833ba8469139 --- /dev/null +++ b/sdk/agfood/armagfood/build.go @@ -0,0 +1,4 @@ +// This file enables 'go generate' to regenerate this specific SDK +//go:generate pwsh.exe ..\..\..\eng\scripts\build.ps1 -skipBuild -generate armagfood + +package armagfood From e30aa13a95e58236edd06f5e43e340510c9a01c8 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 12 Jul 2021 10:20:33 -0500 Subject: [PATCH 2/9] Add copyright --- sdk/agfood/armagfood/build.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/agfood/armagfood/build.go b/sdk/agfood/armagfood/build.go index 833ba8469139..f38f8ebf54d5 100644 --- a/sdk/agfood/armagfood/build.go +++ b/sdk/agfood/armagfood/build.go @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + // This file enables 'go generate' to regenerate this specific SDK //go:generate pwsh.exe ..\..\..\eng\scripts\build.ps1 -skipBuild -generate armagfood From 571016ca711ee26427b29397d96438fb75512a15 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 12 Jul 2021 10:39:09 -0500 Subject: [PATCH 3/9] Add clean for build.ps1 --- eng/scripts/build.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1 index 5d718a6270ff..e9a0c2a1cfa2 100644 --- a/eng/scripts/build.ps1 +++ b/eng/scripts/build.ps1 @@ -1,5 +1,5 @@ #Requires -Version 7.0 -param($filter, [switch]$vet, [switch]$generate, [switch]$skipBuild, $parallel = 5) +param($filter, [switch]$clean, [switch]$vet, [switch]$generate, [switch]$skipBuild, $parallel = 5) $startingDirectory = Get-Location $root = Resolve-Path ($PSScriptRoot + "/../..") @@ -10,6 +10,7 @@ foreach ($sdk in (./eng/scripts/get_module_dirs.ps1 -serviceDir 'sdk/...')) { $name = $sdk | split-path -leaf $sdks[$name] = @{ 'path' = $sdk; + 'clean' = $clean; 'vet' = $vet; 'generate' = $generate; 'skipBuild' = $skipBuild; @@ -26,6 +27,11 @@ if (![string]::IsNullOrWhiteSpace($filter)) { $keys | ForEach-Object { $sdks[$_] } | ForEach-Object -Parallel { Push-Location $_.path + if ($_.clean) { + Write-Host "##[command]Executing go clean -v ./... in " $_.path + go clean -v ./... + } + if ($_.generate) { Write-Host "##[command]Executing autorest.go in " $_.path $autorestPath = $_.path + "\autorest.md" From be31548db875e9e997515ed755bab7f9ae35e605 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 12 Jul 2021 10:51:24 -0500 Subject: [PATCH 4/9] Try disabling parallel --- eng/scripts/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1 index e9a0c2a1cfa2..53f997e57a5b 100644 --- a/eng/scripts/build.ps1 +++ b/eng/scripts/build.ps1 @@ -1,5 +1,5 @@ #Requires -Version 7.0 -param($filter, [switch]$clean, [switch]$vet, [switch]$generate, [switch]$skipBuild, $parallel = 5) +param($filter, [switch]$clean, [switch]$vet, [switch]$generate, [switch]$skipBuild, $parallel = 1) $startingDirectory = Get-Location $root = Resolve-Path ($PSScriptRoot + "/../..") From 85af8fb4894bf4e2c0095b1d81357b44f4df5764 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 12 Jul 2021 13:21:22 -0500 Subject: [PATCH 5/9] CI debug print --- eng/scripts/build.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1 index 53f997e57a5b..33db724fad98 100644 --- a/eng/scripts/build.ps1 +++ b/eng/scripts/build.ps1 @@ -43,6 +43,8 @@ $keys | ForEach-Object { $sdks[$_] } | ForEach-Object -Parallel { if (!$_.skipBuild) { Write-Host "##[command]Executing go build -v ./... in " $_.path go build -v ./... + Write-Host "##[command]Build Complete!" + } if ($_.vet) { Write-Host "##[command]Executing go vet ./... in " $_.path From 3974e70775e006ee45ab180e0a2ab429ec101200 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 12 Jul 2021 13:28:10 -0500 Subject: [PATCH 6/9] Slap on more args --- eng/scripts/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1 index 33db724fad98..e16509862109 100644 --- a/eng/scripts/build.ps1 +++ b/eng/scripts/build.ps1 @@ -42,7 +42,7 @@ $keys | ForEach-Object { $sdks[$_] } | ForEach-Object -Parallel { } if (!$_.skipBuild) { Write-Host "##[command]Executing go build -v ./... in " $_.path - go build -v ./... + go build -x -v ./... Write-Host "##[command]Build Complete!" } From acb98d730449689d4065a254d1703b06e5a08217 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 12 Jul 2021 16:52:00 -0500 Subject: [PATCH 7/9] Remove parallel --- eng/scripts/build.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1 index e16509862109..113c4511143d 100644 --- a/eng/scripts/build.ps1 +++ b/eng/scripts/build.ps1 @@ -1,5 +1,5 @@ #Requires -Version 7.0 -param($filter, [switch]$clean, [switch]$vet, [switch]$generate, [switch]$skipBuild, $parallel = 1) +param($filter, [switch]$clean, [switch]$vet, [switch]$generate, [switch]$skipBuild) $startingDirectory = Get-Location $root = Resolve-Path ($PSScriptRoot + "/../..") @@ -24,7 +24,7 @@ if (![string]::IsNullOrWhiteSpace($filter)) { $keys = $keys.Where( { $_ -match $filter }) } -$keys | ForEach-Object { $sdks[$_] } | ForEach-Object -Parallel { +$keys | ForEach-Object { $sdks[$_] } | ForEach-Object { Push-Location $_.path if ($_.clean) { @@ -51,6 +51,6 @@ $keys | ForEach-Object { $sdks[$_] } | ForEach-Object -Parallel { go vet ./... } Pop-Location -} -ThrottleLimit $parallel +} Set-Location $startingDirectory \ No newline at end of file From 475ab4891c779983770262492471f6dfd0ab8020 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Tue, 20 Jul 2021 11:40:43 -0500 Subject: [PATCH 8/9] Update eng/scripts/build.ps1 Co-authored-by: Rick Winter --- eng/scripts/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/build.ps1 b/eng/scripts/build.ps1 index 113c4511143d..6b909c593505 100644 --- a/eng/scripts/build.ps1 +++ b/eng/scripts/build.ps1 @@ -53,4 +53,4 @@ $keys | ForEach-Object { $sdks[$_] } | ForEach-Object { Pop-Location } -Set-Location $startingDirectory \ No newline at end of file +Set-Location $startingDirectory From c1a1822b4b6c234e9ff0b43fc78f779a21b873b4 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Tue, 20 Jul 2021 11:43:43 -0500 Subject: [PATCH 9/9] Remove food files --- sdk/agfood/armagfood/autorest.md | 8 -------- sdk/agfood/armagfood/build.go | 7 ------- 2 files changed, 15 deletions(-) delete mode 100644 sdk/agfood/armagfood/autorest.md delete mode 100644 sdk/agfood/armagfood/build.go diff --git a/sdk/agfood/armagfood/autorest.md b/sdk/agfood/armagfood/autorest.md deleted file mode 100644 index 002e18304705..000000000000 --- a/sdk/agfood/armagfood/autorest.md +++ /dev/null @@ -1,8 +0,0 @@ -### AutoRest Configuration -> see https://aka.ms/autorest - -``` yaml -tag: package-2020-05-12-preview -require: - - https://github.com/Azure/azure-rest-api-specs/blob/9875f8eebd8c1392a83c052bc50a79c8251b1174/specification/agfood/resource-manager/readme.md -``` \ No newline at end of file diff --git a/sdk/agfood/armagfood/build.go b/sdk/agfood/armagfood/build.go deleted file mode 100644 index f38f8ebf54d5..000000000000 --- a/sdk/agfood/armagfood/build.go +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for license information. - -// This file enables 'go generate' to regenerate this specific SDK -//go:generate pwsh.exe ..\..\..\eng\scripts\build.ps1 -skipBuild -generate armagfood - -package armagfood