Compare commits

...

3 commits

Author SHA1 Message Date
Travis Plunk a090b9eb5f
use different containers for different branches (#16434) 2021-11-10 13:34:29 -08:00
Travis Plunk 292c63430b
Add import so we can use common GitHub workflow function. (#16433)
* Update daily.yml

* Update daily.yml

* try changing error action (#16435)

* Add exit 0 (#16436)
2021-11-10 13:09:28 -08:00
Aditya Patwardhan 9cb33d48a8
Remove pre-release .NET 6 build sources (#16418)
* Remove pre-release .NET 6 build sources

* Update nuget.config
2021-11-10 13:00:18 -08:00
4 changed files with 23 additions and 6 deletions

View file

@ -72,14 +72,17 @@ jobs:
git status --short
- name: Check if we need to create a PR
run: |
$ErrorActionPreference = 'continue'
git diff --quiet ThirdPartyNotices.txt
$exitCode = $LASTEXITCODE
Write-Verbose -Message "Exit code: $exitCode" -Verbose
if ($LASTEXITCODE -ne 0) {
Import-Module ./.github/workflows/GHWorkflowHelper
Set-GWVariable -Name CREATE_PR -Value 'true'
} else {
Write-Verbose "No difference found. Not creating a PR." -Verbose
}
exit 0
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
id: cprtpn

View file

@ -6,10 +6,10 @@
"packageVersionPattern": "6.0.0",
"sdkImageVersion": "6.0.100",
"nextChannel": "6.0.1xx",
"azureFeed": "https://dotnetstage.blob.core.windows.net/6-0-100-rtm-21527-11-public",
"sdkImageOverride": "6.0.100-rtm.21527.11"
"azureFeed": "",
"sdkImageOverride": ""
},
"internalfeed" : {
"url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21527.11-shipping/nuget/v2"
"url": ""
}
}

View file

@ -2,9 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-internal" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21524.1-shipping/nuget/v2" />
</packageSources>
<disabledPackageSources>
<clear />

View file

@ -24,6 +24,22 @@ jobs:
- checkout: self
clean: true
- pwsh: |
[string]$Branch=$env:BUILD_SOURCEBRANCH
$branchOnly = $Branch -replace '^refs/heads/';
$branchOnly = $branchOnly -replace '[_\-]'
if ($branchOnly -eq 'master') {
$container = 'tpn'
} else {
$container = "tpn-$branchOnly"
}
$vstsCommandString = "vso[task.setvariable variable=tpnContainer]$container"
Write-Verbose -Message $vstsCommandString -Verbose
Write-Host -Object "##$vstsCommandString"
displayName: Set ContainerName
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName: 'Component Detection'
inputs:
@ -58,7 +74,7 @@ jobs:
azureSubscription: '$(AzureFileCopySubscription)'
Destination: AzureBlob
storage: '$(StorageAccount)'
ContainerName: 'tpn'
ContainerName: $(tpnContainer)
resourceGroup: '$(StorageResourceGroup)'
- task: PublishPipelineArtifact@1