Skip to content

Commit

Permalink
Pull in main into the feature/iot pnp branch. (#1821)
Browse files Browse the repository at this point in the history
* Sync eng/common directory with azure-sdk-tools for PR 1579 (#1724)

* Allow propogation of SetDevVersion.

* Allow use of SetDevVersion locally and across stages.

Co-authored-by: Mitch Denny <midenn@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1524 (#1728)

* Make RELEASE_TITLE_REGEX more specific

* Update eng/common/scripts/ChangeLog-Operations.ps1

Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

* Update release REGEX

* tighten up changelog verification

* Ensure releaseDate is in the appriopriate format.

* Update error messages.

* Retrun false after error

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
Co-authored-by: Chidozie Ononiwu <31145988+chidozieononiwu@users.noreply.github.com>
Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

* Update samples to include log of mqtt client username (#1731)

* Typo "Github"→"GitHub" (#1738)

* Revert changes to SetDevVersion. (#1740)

Co-authored-by: Mitch Denny <midenn@microsoft.com>

* Add better error handling in Prepare-Release (#1746)

Co-authored-by: Wes Haggard <Wes.Haggard@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1594 (#1747)

* Update sparse checkout create directory step name

* plumb BaseBranchName to create pull request

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>

* Fix sample readme urls (#1752)

* allow multiple invocations of archetype-sdk-tests-generate (#1754)

Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>

* Sync eng/common directory with azure-sdk-tools for PR 1585 (#1758)

* Sparse checkout docs repository in release step

* Detect default branch for custom sparse checkout repository

* Use sparse checkout paths parameter in docs metadata release

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1615 (#1761)

* Move docindex.yml from steps -> jobs

* Add docindex.yml

Co-authored-by: Daniel Jurek <djurek@microsoft.com>

* add clang format version (#1755)

* Sync eng/common directory with azure-sdk-tools for PR 1627 (#1763)

* Refactor sparse checkout template: idempotency and no yaml loops

* Add logging, re-organize sparse checkout script

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>

* Add Get-ChangeLogEntriesFromContent (#1764)

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1635 (#1767)

* Update common engineering system for docs onboarding

* Add updates from review feedback

* Space nit

Co-authored-by: Daniel Jurek <djurek@microsoft.com>

* add empty section for compile options (#1741)

* Enable Caching of PS Modules (#1769)

- Remove copied AzPowershell utilities
- Add latest AZ module path already on hosted agents to PSModulePath
- Rename setup-az-modules template setup-environments to reflect what is is doing
- Add support for Caching the current user PS Module folder
- Add support for install-module if not already present in module folder
- Organize the live test clean-up script to be in the standard location

Co-authored-by: Wes Haggard <Wes.Haggard@microsoft.com>

* Adding new CA trusted certificates (#1765)

Adding new CA certificates and updating the documentation to create a store when testing in Windows or OSX.

* Sync eng/common directory with azure-sdk-tools for PR 1611 (#1766)

* Add API status check

* Revert temp change

* Update as per review comments

* Removed blank line

* Review comments to use az cli

* Changes to move az cli commands to caller script and other review comments

* Skip languages that's not supported in APIView

* Fix bug in language mapping

Co-authored-by: praveenkuttappan <prmarott@microsoft.com>
Co-authored-by: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>

* Fix for Issue #1768  - Response Types (#1770)

* Add the ability to check for open pull request to a different repo. (#1774)

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>

* Fetch specific branch name only in git-branch-push script (#1771)

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>

* Use generate matrix job name parameter as display name (#1776)

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>

* Updating documentation for ECC server certificate chain support. (#1773)

* Sync eng/common directory with azure-sdk-tools for PR 1633 (#1778)

* Update format of new Changelog Entry

* Add parsing of changelog sections

* Update ChangeLog Logic

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
Co-authored-by: Chidozie Ononiwu <31145988+chidozieononiwu@users.noreply.github.com>

* Strict mode needs the variables initialized (#1779)

Co-authored-by: Wes Haggard <Wes.Haggard@microsoft.com>

* Fix of depricated BearSSL method call of WiFiClientSecure class in sample for ESP8266. (#1780)

* Fix of depricated BearSSL method call in sample for ESP8266.

* Fix of depricated BearSSL method call of WiFiClientSecure class in sample for ESP8266.

Co-authored-by: ts\bozicekm <miha.bozicek@telekom.si>

* Sync eng/common directory with azure-sdk-tools for PR 1688 (#1782)

* Add verification of changelog sections

* Update eng/common/scripts/ChangeLog-Operations.ps1

Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
Co-authored-by: Chidozie Ononiwu <31145988+chidozieononiwu@users.noreply.github.com>
Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

* Update for master -> main branch rename (#1783)

* ci.yml -- Add forward compatability with "main" to triggering branches

* Fix hard-coded master (#1788)

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1716 (#1790)

* Update links with master to use main

* Update ci.yml files

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1719 (#1793)

* Update pipeline generation tool version

Consume latest changes from pipeline generation tool in Azure/azure-sdk-tools#1708

* Update tool version to include fix for public ci

Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

* Sync eng/common directory with azure-sdk-tools for PR 1729 (#1794)

* Check for API review status only if release date is set in changelog

* Change property name to ReleaseStatus

Co-authored-by: Praveen Kuttappan <praveen.kuttappan@gmail.com>

* Add Ubuntu 20 to local dns bypass template (#1795)

Co-authored-by: Praveen Kuttappan <praveen.kuttappan@gmail.com>
Co-authored-by: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>

* Update master to main (#1798)

* Update references from master to main (#1799)

Co-authored-by: Wes Haggard <Wes.Haggard@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1725 (#1805)

* Bring changes from JS docs metadata

* Move business logic inside Update-DocsMsMetadata.ps1

* Update with the latest changes in JS PR

* Update from latest PR feedback

* Add check for empty path to prevent crashes when creating relative paths

Co-authored-by: Daniel Jurek <djurek@microsoft.com>

* Update devops workitem helpers (#1806)

- Switch to using rest instead of cli for querying work items
  as cli is limited to 1000 items only.
- Fix issues with Generated fields not being set.
- Correctly sort older workitems by version isntead of string.

Co-authored-by: Wes Haggard <Wes.Haggard@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1763 (#1807)

* Disable release date check

* Release check is not finding release date

Co-authored-by: Praveen Kuttappan <praveen.kuttappan@gmail.com>
Co-authored-by: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>

* only add compiler flags for tests (#1791)

* Update docs metadata mutation logic (#1810)

Co-authored-by: Daniel Jurek <djurek@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1772 (#1812)

* Update change log headers based on guideline update

Updates based on Azure/azure-sdk#3103

- Renamed "Key Bugs Fixed" to "Bugs Fixed"
- Renamed "Fixed" to "Other Changes"

Added a warning in validation if at lease one of the recommended
headers aren't used.

* Update eng/common/scripts/ChangeLog-Operations.ps1

Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>

Co-authored-by: Wes Haggard <Wes.Haggard@microsoft.com>
Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>

* Add public current depth field to JSON reader. (#1802)

* Add public current depth field to JSON reader.

* Add a CL entry.

* Fix typo in src comment.

* Update codeowners file (#1809)

* Switch ubuntu 18 to ubuntu 20 (#1814)

Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>

* Sync eng/common directory with azure-sdk-tools for PR 1767 (#1813)

* Support building and deploying bicep templates

* Add bicep powershell install aka link to deployment error message

* Write bicep compiled arm templates to temp directory

* Simplify bicep building code/function usage

* Use bicep location for compiled arm templates, and remove them on success

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>

* Add base64 encoding and decoding APIs that accept az_span. (#1816)

* Add base64 encoding and decoding APIs that accept az_span.

* Add entry to the changelog.

* Address PR feedback - move const to r.h.s.

* Fix link substitution (#1820)

* Fix doc publishing to support basic link substitution

* Remove publishing for az_storage_blobs

Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Co-authored-by: Mitch Denny <midenn@microsoft.com>
Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
Co-authored-by: Chidozie Ononiwu <31145988+chidozieononiwu@users.noreply.github.com>
Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
Co-authored-by: Mollie Munoz <mollie.munoz@microsoft.com>
Co-authored-by: Hiroshi Yoshioka <40815708+hyoshioka0128@users.noreply.github.com>
Co-authored-by: Wes Haggard <Wes.Haggard@microsoft.com>
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
Co-authored-by: Daniel Jurek <djurek@microsoft.com>
Co-authored-by: Dane Walton <dane.walton@microsoft.com>
Co-authored-by: Cristian Pop <CIPop@users.noreply.github.com>
Co-authored-by: praveenkuttappan <prmarott@microsoft.com>
Co-authored-by: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com>
Co-authored-by: Miha Božiček <miha.bozicek@gmail.com>
Co-authored-by: ts\bozicekm <miha.bozicek@telekom.si>
Co-authored-by: Praveen Kuttappan <praveen.kuttappan@gmail.com>
Co-authored-by: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Co-authored-by: Rick Winter <rick.winter@microsoft.com>
  • Loading branch information
21 people authored Jul 9, 2021
1 parent 97cde2c commit 2a4b93e
Show file tree
Hide file tree
Showing 62 changed files with 4,237 additions and 279 deletions.
20 changes: 10 additions & 10 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# Instructions for CODEOWNERS file format and automatic build failure notifications:
# https://github.com/Azure/azure-sdk/blob/master/docs/policies/opensource.md#codeowners
# https://github.com/Azure/azure-sdk/blob/main/docs/policies/opensource.md#codeowners

###########
# SDK
###########

# Catch all for non-code project files
* @rickwinter @joshfree
* @rickwinter

# SDK team
/sdk/ @ahsonkhan @antkmsft @rickwinter @vhvb1989
/sdk/ @rickwinter

# Samples
/samples/ @rickwinter
/samples/ @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama

# Service teams
# Core
sdk/docs/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989
sdk/inc/azure/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989
sdk/samples/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989
sdk/src/azure/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989
sdk/tests/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989
sdk/docs/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
sdk/inc/azure/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
sdk/samples/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
sdk/src/azure/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama
sdk/tests/core/ @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama

# IoT
sdk/docs/iot/ @CIPop @danewalton @ericwol-msft @ewertons @hihigupt @jspaith @momuno
Expand All @@ -30,7 +30,7 @@ sdk/src/azure/iot/ @CIPop @danewalton @ericwol-msft @ewertons @hihigu
sdk/tests/iot/ @CIPop @danewalton @ericwol-msft @ewertons @hihigupt @jspaith @momuno

# Platform
sdk/src/azure/platform/ @ahsonkhan @antkmsft @rickwinter @vhvb1989
sdk/src/azure/platform/ @ahsonkhan @antkmsft @rickwinter @vhvb1989 @gearama

###########
# Eng Sys
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## 1.2.0-beta.1 (Unreleased)

### New Features

- Added a current depth field to the JSON reader.
- Added base64 encoding and decoding APIs that accept `az_span`, available from the `azure/core/az_base64.h` header.

### Bug Fixes

- [[#1640]](https://github.com/Azure/azure-sdk-for-c/pull/1640) Update precondition on `az_iot_provisioning_client_parse_received_topic_and_payload()` to require topic and payload minimum size of 1 instead of 0.
Expand All @@ -14,7 +19,7 @@
- Compared to the previous 1.0.0 release, there are **no** breaking changes.
- Removed `az_iot_pnp_client.h`, which included some beta APIs related to IoT Plug and Play such as `az_iot_pnp_client()`.
- These will ship in a future release and will continue to be available as beta from [this feature branch](https://github.com/Azure/azure-sdk-for-c/tree/feature/iot_pnp).

### Bug Fixes

- [[#1600]](https://github.com/Azure/azure-sdk-for-c/pull/1600) Make sure `az_json_writer_append_json_text()` appends a comma between elements of a JSON array.
Expand Down Expand Up @@ -197,4 +202,4 @@

## 1.0.0-preview.1 (2020-05-12)

Initial release. Please see the [README](https://github.com/Azure/azure-sdk-for-c/blob/master/README.md) for more information.
Initial release. Please see the [README](https://github.com/Azure/azure-sdk-for-c/blob/main/README.md) for more information.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,5 +161,5 @@ make ${project_name}_cov_xml //i.e. az_core_cov_xml or az_iot_cov_xml
```
<!-- LINKS -->
[vcpkg]: https://github.com/Azure/azure-sdk-for-c/blob/master/README.md#development-environment
[vcpkg]: https://github.com/Azure/azure-sdk-for-c/blob/main/README.md#development-environment
[azure_sdk_for_c_cmake_options]: https://github.com/Azure/azure-sdk-for-c#cmake-options
54 changes: 27 additions & 27 deletions README.md

Large diffs are not rendered by default.

49 changes: 27 additions & 22 deletions eng/cmake/global_compile_options.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
if(MSVC)
if(WARNINGS_AS_ERRORS)
set(WARNINGS_AS_ERRORS_FLAG "/WX")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WX")
endif()

add_compile_options(/W4 ${WARNINGS_AS_ERRORS_FLAG} /wd5031 /wd4668 /wd4820 /wd4255 /wd4710 /analyze)

add_compile_options(
$<$<CONFIG:>:/MT> #---------|
$<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
$<$<CONFIG:Release>:/MT> #--|
$<$<CONFIG:>:/MT> #---------|
$<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
$<$<CONFIG:Release>:/MT> #--|
)
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
if(WARNINGS_AS_ERRORS)
set(WARNINGS_AS_ERRORS_FLAG "-Werror")
endif()
endif()

add_compile_options(-Xclang -Wall -Wextra -pedantic ${WARNINGS_AS_ERRORS_FLAG} -Wdocumentation -Wdocumentation-unknown-command -fcomment-block-commands=retval -Wcast-qual -Wunused -Wuninitialized -Wmissing-declarations -Wconversion -Wpointer-arith -Wshadow -Wfloat-equal)
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU")
if(WARNINGS_AS_ERRORS)
set(WARNINGS_AS_ERRORS_FLAG "-Werror")
endif()
# Turn on strict compiler flags only for testing to allow better compatability with diverse platforms.
if(UNIT_TESTING)
if(MSVC)
if(WARNINGS_AS_ERRORS)
set(WARNINGS_AS_ERRORS_FLAG "/WX")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WX")
endif()

add_compile_options(/W4 ${WARNINGS_AS_ERRORS_FLAG} /wd5031 /wd4668 /wd4820 /wd4255 /wd4710 /analyze)
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
if(WARNINGS_AS_ERRORS)
set(WARNINGS_AS_ERRORS_FLAG "-Werror")
endif()

add_compile_options(-Wall -Wextra -pedantic ${WARNINGS_AS_ERRORS_FLAG} -Wcast-qual -Wunused -Wuninitialized -Wmissing-declarations -Wconversion -Wpointer-arith -Wshadow -Wlogical-op -Wfloat-equal)
else()
message(WARNING "Using an unsupported compiler. Disabling stricter compiler flags.")
add_compile_options(-Xclang -Wall -Wextra -pedantic ${WARNINGS_AS_ERRORS_FLAG} -Wdocumentation -Wdocumentation-unknown-command -fcomment-block-commands=retval -Wcast-qual -Wunused -Wuninitialized -Wmissing-declarations -Wconversion -Wpointer-arith -Wshadow -Wfloat-equal)
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU")
if(WARNINGS_AS_ERRORS)
set(WARNINGS_AS_ERRORS_FLAG "-Werror")
endif()

add_compile_options(-Wall -Wextra -pedantic ${WARNINGS_AS_ERRORS_FLAG} -Wcast-qual -Wunused -Wuninitialized -Wmissing-declarations -Wconversion -Wpointer-arith -Wshadow -Wlogical-op -Wfloat-equal)
else()
message(WARNING "Using an unsupported compiler. Disabling stricter compiler flags.")
endif()
endif()
2 changes: 1 addition & 1 deletion eng/common/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Common Engineering System

Updates under this directory should only be made in the `azure-sdk-tools` repo as any changes under this directory outside of that repo will end up getting overwritten with future updates. For information about making updates see [common engineering system docs](https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md)
Updates under this directory should only be made in the `azure-sdk-tools` repo as any changes under this directory outside of that repo will end up getting overwritten with future updates. For information about making updates see [common engineering system docs](https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md)
42 changes: 35 additions & 7 deletions eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,26 @@ function MergeHashes([hashtable] $source, [psvariable] $dest) {
}
}

function BuildBicepFile([System.IO.FileSystemInfo] $file) {
if (!(Get-Command bicep -ErrorAction Ignore)) {
Write-Error "A bicep file was found at '$($file.FullName)' but the Azure Bicep CLI is not installed. See https://aka.ms/install-bicep-pwsh"
throw
}

$tmp = $env:TEMP ? $env:TEMP : [System.IO.Path]::GetTempPath()
$templateFilePath = Join-Path $tmp "test-resources.$(New-Guid).compiled.json"

# Az can deploy bicep files natively, but by compiling here it becomes easier to parse the
# outputted json for mismatched parameter declarations.
bicep build $file.FullName --outfile $templateFilePath
if ($LASTEXITCODE) {
Write-Error "Failure building bicep file '$($file.FullName)'"
throw
}

return $templateFilePath
}

# Support actions to invoke on exit.
$exitActions = @({
if ($exitActions.Count -gt 1) {
Expand All @@ -140,15 +160,18 @@ try {
# Enumerate test resources to deploy. Fail if none found.
$repositoryRoot = "$PSScriptRoot/../../.." | Resolve-Path
$root = [System.IO.Path]::Combine($repositoryRoot, "sdk", $ServiceDirectory) | Resolve-Path
$templateFileName = 'test-resources.json'
$templateFiles = @()

Write-Verbose "Checking for '$templateFileName' files under '$root'"
Get-ChildItem -Path $root -Filter $templateFileName -Recurse | ForEach-Object {
$templateFile = $_.FullName

Write-Verbose "Found template '$templateFile'"
$templateFiles += $templateFile
'test-resources.json', 'test-resources.bicep' | ForEach-Object {
Write-Verbose "Checking for '$_' files under '$root'"
Get-ChildItem -Path $root -Filter "$_" -Recurse | ForEach-Object {
Write-Verbose "Found template '$($_.FullName)'"
if ($_.Extension -eq '.bicep') {
$templateFiles += (BuildBicepFile $_)
} else {
$templateFiles += $_.FullName
}
}
}

if (!$templateFiles) {
Expand Down Expand Up @@ -556,6 +579,11 @@ try {
Log "Invoking post-deployment script '$postDeploymentScript'"
&$postDeploymentScript -ResourceGroupName $ResourceGroupName -DeploymentOutputs $deploymentOutputs @PSBoundParameters
}

if ($templateFile.EndsWith('.compiled.json')) {
Write-Verbose "Removing compiled bicep file $templateFile"
Remove-Item $templateFile
}
}

} finally {
Expand Down
2 changes: 2 additions & 0 deletions eng/common/TestResources/deploy-test-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,5 @@ steps:
-Force `
-Verbose | Out-Null
displayName: Deploy test resources
env:
TEMP: $(Agent.TempDirectory)
2 changes: 1 addition & 1 deletion eng/common/docgeneration/Generate-DocIndex.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,5 @@ else
{
LogWarning "The function for 'GetGithubIoDocIndexFn' was not found.`
Make sure it is present in eng/scripts/Language-Settings.ps1 and referenced in eng/common/scripts/common.ps1.`
See https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md#code-structure"
See https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md#code-structure"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ parameters:
default: []
- name: Pool
type: string
default: azsdk-pool-mms-ubuntu-1804-general
default: azsdk-pool-mms-ubuntu-2004-general
- name: OsVmImage
type: string
default: MMSUbuntu18.04
default: MMSUbuntu20.04
# This parameter is only necessary if there are multiple invocations of this template within the SAME STAGE.
# When that occurs, provide a name other than the default value.
- name: GenerateJobName
Expand Down
4 changes: 3 additions & 1 deletion eng/common/pipelines/templates/steps/bypass-local-dns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ steps:
succeededOrFailed(),
or(
eq(variables['OSVmImage'], 'ubuntu-18.04'),
eq(variables['OSVmImage'], 'MMSUbuntu18.04')
eq(variables['OSVmImage'], 'ubuntu-20.04'),
eq(variables['OSVmImage'], 'MMSUbuntu18.04'),
eq(variables['OSVmImage'], 'MMSUbuntu20.04')
),
eq(variables['Container'], '')
)
2 changes: 1 addition & 1 deletion eng/common/pipelines/templates/steps/check-spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# and some ref (branch, tag, etc.) or commit hash. Only runs on PRs.
# ContinueOnError - true: Pipeline warns on spelling error
# false: Pipeline fails on spelling error
# TargetBranch - Target ref (e.g. master) to compare to create file change
# TargetBranch - Target ref (e.g. main) to compare to create file change
# list.
# CspellConfigPath - Path to cspell.json config location

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ parameters:
default: ''
- name: PRBranchName
type: string
default: 'master-rdme'
default: 'main-rdme'
- name: PRLabels
type: string
default: 'auto-merge'
Expand Down
10 changes: 10 additions & 0 deletions eng/common/pipelines/templates/steps/enable-long-path-support.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
steps:
- pwsh: |
if ($IsWindows) {
REG ADD HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem /f /v LongPathsEnabled /t REG_DWORD /d 1
git config --system core.longpaths true
}
else {
Write-Host "This script is not executing on Windows, skipping registry modification."
}
displayName: Enable long path support if necessary
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
if (($LASTEXITCODE -eq 0) -and ($filesInCommonDir.Count -gt 0))
{
Write-Host "##vso[task.LogIssue type=error;]Changes to files under 'eng/common' directory should not be made in this Repo`n${filesInCommonDir}"
Write-Host "##vso[task.LogIssue type=error;]Please follow workflow at https://github.com/Azure/azure-sdk-tools/blob/master/doc/common/common_engsys.md"
Write-Host "##vso[task.LogIssue type=error;]Please follow workflow at https://github.com/Azure/azure-sdk-tools/blob/main/doc/common/common_engsys.md"
exit 1
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ steps:
- script: >
dotnet tool install
Azure.Sdk.Tools.PipelineGenerator
--version 1.0.2-dev.20210309.1
--version 1.0.2-dev.20210621.4
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk/nuget/v3/index.json
--tool-path ${{parameters.ToolPath}}
workingDirectory: $(Pipeline.Workspace)/pipeline-generator
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
parameters:
- name: DailyBranchVariableName
type: string
default: TargetBranchName

steps:
- pwsh: |
$branchName = $env:DAILYDOCSBRANCHNAMEOVERRIDE
if (!$branchName) {
$branchName = "daily/$(Get-Date -Format 'yyyy-MM-dd')"
}
Write-Host "Daily Branch Name: $branchName"
Write-Host "##vso[task.setvariable variable=${{ parameters.DailyBranchVariableName }};]$branchName"
displayName: Set daily docs branch name in $(${{ parameters.DailyBranchVariableName }})
9 changes: 5 additions & 4 deletions eng/common/pipelines/templates/steps/set-default-branch.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
parameters:
WorkingDirectory: '$(System.DefaultWorkingDirectory)'
RemoteRepo: 'origin'
DefaultBranchVariableName: DefaultBranch
steps:
- pwsh: |
$setDefaultBranch = (git remote show ${{ parameters.RemoteRepo }} | Out-String) -replace "(?ms).*HEAD branch: (\w+).*", '$1'
if ($LASTEXITCODE -ne 0) {
Write-Host "Not able to fetch the default branch from git command. Set to master."
$setDefaultBranch = 'master'
Write-Host "Not able to fetch the default branch from git command. Set to main."
$setDefaultBranch = 'main'
}
Write-Host "Setting DefaultBranch=$setDefaultBranch"
Write-Host "##vso[task.setvariable variable=DefaultBranch]$setDefaultBranch"
Write-Host "Setting ${{ parameters.DefaultBranchVariableName }}=$setDefaultBranch"
Write-Host "##vso[task.setvariable variable=${{ parameters.DefaultBranchVariableName }}]$setDefaultBranch"
displayName: "Setup Default Branch"
workingDirectory: ${{ parameters.workingDirectory }}
ignoreLASTEXITCODE: true
Loading

0 comments on commit 2a4b93e

Please sign in to comment.