Skip to content

Commit 1e67a20

Browse files
authored
Merge branch 'main' into nagilson-find-locally-managed-rntim
2 parents a5d03fb + 16e11a7 commit 1e67a20

35 files changed

+9760
-10272
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Copilot Setup Steps
2+
3+
# Automatically run the setup steps when they are changed to allow for easy validation, and
4+
# allow manual testing through the repository's "Actions" tab
5+
on:
6+
workflow_dispatch:
7+
push:
8+
paths:
9+
- .github/workflows/copilot-setup-steps.yml
10+
pull_request:
11+
paths:
12+
- .github/workflows/copilot-setup-steps.yml
13+
14+
permissions:
15+
contents: read
16+
17+
env:
18+
# Allow Copilot to access Visual Studio assets URLs needed for NuGet restore
19+
COPILOT_AGENT_FIREWALL_ALLOW_LIST_ADDITIONS: "vsblob.vsassets.io"
20+
21+
jobs:
22+
copilot-setup-steps:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
- name: Do an initial build to ensure all dependencies are restored
27+
run: |
28+
./build.sh

1es-azure-pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ extends:
9494
- template: pipeline-templates/lint.yaml@self
9595
parameters:
9696
pool:
97-
name: Azure Pipelines
98-
image: macOS-latest
99-
os: macOS
97+
name: NetCore1ESPool-Internal
98+
image: 1es-windows-2022
99+
os: windows
100100
useOneEngineeringPool: true
101101
- template: pipeline-templates/package-vsix.yaml@self
102102
parameters:

1pr-azure-pipeline.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ variables:
2020
value: true
2121

2222
# The public PR pool schema is different from the 1ES one. We use 'vmImage' which is a default azure pipeline schema. 'os' and 'name' have nothing to do with image selection here.
23-
# 1ES uses 'image' but defining an image this way using our public pools duseOneEngineeringPool not work as they aren't configured this way.
23+
# 1ES uses 'image' but defining an image this way using our public pools useOneEngineeringPool not work as they aren't configured this way.
2424
# We can later add the flag 'useOneEngineeringPool' or one engineering system: false or true in all tasks to determine if we use vmImage or a 1es pool object.
2525
parameters:
2626
- name: pools
2727
type: object
2828
default:
2929
- name: NetCore-Public
30-
vmImage: windows-latest
30+
demands: ImageOverride -equals 1es-windows-2022-open
3131
os: windows
3232
emoji: 🪟
3333
- name: NetCore-Public
34-
vmImage: ubuntu-latest
34+
demands: ImageOverride -equals 1es-ubuntu-2004-open
3535
os: linux
3636
emoji: 🐧
37-
- name: NetCore-Public
37+
- name: Azure Pipelines
3838
vmImage: macOS-latest
3939
os: macOS
4040
emoji: 🍎
@@ -46,7 +46,11 @@ stages:
4646
- template: pipeline-templates/build-test.yaml
4747
parameters:
4848
pool:
49-
vmImage: ${{ image.vmImage }}
49+
name: ${{ image.name }}
50+
${{ if image.demands }}:
51+
demands: ${{ image.demands }}
52+
${{ if image.vmImage }}:
53+
vmImage: ${{ image.vmImage }}
5054
os: ${{ image.os }}
5155
emoji: ${{ image.emoji }}
5256
useOneEngineeringPool: false
@@ -59,13 +63,15 @@ stages:
5963
- template: pipeline-templates/lint.yaml
6064
parameters:
6165
pool:
62-
vmImage: macOS-latest
63-
os: macOS
66+
name: NetCore-Public
67+
demands: ImageOverride -equals 1es-windows-2022-open
68+
os: windows
6469
useOneEngineeringPool: false
6570
- template: pipeline-templates/package-vsix.yaml
6671
parameters:
6772
pool:
68-
vmImage: windows-latest
73+
name: NetCore-Public
74+
demands: ImageOverride -equals 1es-windows-2022-open
6975
os: windows
7076
useOneEngineeringPool: false
7177
SignType: Test

0 commit comments

Comments
 (0)