Skip to content

Commit 376a235

Browse files
authored
[release/6.0] Use simpler Docker tags (#29575)
- also align helix.proj (default) Helix queues w/ CI choices
1 parent 98d0b23 commit 376a235

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,12 @@ stages:
263263
value: $(_BuildConfig)
264264
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
265265
- name: HelixTargetQueues
266-
value: Windows.10.Amd64.Open;Ubuntu.2204.Amd64.Open;OSX.1100.Amd64.Open;[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20220118141424-3069967
266+
value: Windows.10.Amd64.Open;Ubuntu.2204.Amd64.Open;OSX.1100.Amd64.Open;[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64
267267
- name: _HelixAccessToken
268268
value: '' # Needed for public queues
269269
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
270270
- name: HelixTargetQueues
271-
value: Windows.10.Amd64;Ubuntu.2204.Amd64;OSX.1100.Amd64;[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20220118141424-3069967
271+
value: Windows.10.Amd64;Ubuntu.2204.Amd64;OSX.1100.Amd64;[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64
272272
- name: _HelixAccessToken
273273
value: $(HelixApiAccessToken) # Needed for internal queues
274274
steps:

eng/helix.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<PropertyGroup Condition = "'$(SYSTEM_ACCESSTOKEN)' == ''">
1919
<!-- Local build outside of Azure Pipeline -->
20-
<HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.1804.Amd64.Open;OSX.1014.Amd64.Open;Ubuntu.1604[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20201109180804-3069967</HelixTargetQueues>
20+
<HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.2004.Amd64.Open;OSX.1014.Amd64.Open;Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64</HelixTargetQueues>
2121
<EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
2222
<HelixSource>efcore/localbuild/</HelixSource>
2323
<HelixBuild>t001</HelixBuild>

0 commit comments

Comments
 (0)