Skip to content

Commit 17b6399

Browse files
Copilotradical
andauthored
Remove unused Versions.targets and all CI: false workarounds (#10786)
* Initial plan * Remove unused Versions.targets files and CI: false workarounds Co-authored-by: radical <[email protected]> * Address review feedback: remove empty line and simplify Workload.targets Co-authored-by: radical <[email protected]> * Remove all remaining CI: false workarounds from GitHub workflows Co-authored-by: radical <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: radical <[email protected]> Co-authored-by: Ankit Jain <[email protected]>
1 parent 56a1e30 commit 17b6399

16 files changed

+4
-180
lines changed

.github/actions/enumerate-tests/action.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ runs:
3030

3131
- name: Get list of integration tests
3232
if: ${{ inputs.includeIntegrations }}
33-
env:
34-
CI: false
3533
shell: pwsh
3634
run: >
3735
dotnet build ${{ github.workspace }}/tests/Shared/GetTestProjects.proj
@@ -40,8 +38,6 @@ runs:
4038
4139
- name: Generate list of template tests
4240
if: ${{ inputs.includeTemplates }}
43-
env:
44-
CI: false
4541
shell: pwsh
4642
run: >
4743
dotnet build ${{ github.workspace }}/tests/Aspire.Templates.Tests/Aspire.Templates.Tests.csproj
@@ -56,8 +52,6 @@ runs:
5652
id: generate_integrations_matrix
5753
if: ${{ inputs.includeIntegrations }}
5854
shell: pwsh
59-
env:
60-
CI: false
6155
run: |
6256
$filePath = "${{ github.workspace }}/artifacts/TestsForGithubActions.list"
6357
$lines = Get-Content $filePath
@@ -72,8 +66,6 @@ runs:
7266
id: generate_templates_matrix
7367
if: ${{ inputs.includeTemplates }}
7468
shell: pwsh
75-
env:
76-
CI: false
7769
run: |
7870
$inputFilePath = "${{ github.workspace }}/artifacts/helix/templates-tests/Aspire.Templates.Tests.tests.list"
7971
$lines = Get-Content $inputFilePath

.github/workflows/build-cli-native-archives.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2828

2929
- name: Build CLI packages (Windows)
30-
env:
31-
CI: false
3230
if: ${{ matrix.targets.os == 'windows-latest' }}
3331
shell: pwsh
3432
run: >
@@ -43,8 +41,6 @@ jobs:
4341
${{ inputs.versionOverrideArg }}
4442
4543
- name: Build CLI packages (Unix)
46-
env:
47-
CI: false
4844
if: ${{ matrix.targets.os != 'windows-latest' }}
4945
shell: bash
5046
run: >

.github/workflows/build-packages.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
run: npm i -g @vscode/vsce
2626

2727
- name: Build with packages
28-
env:
29-
CI: false
3028
run: ./build.sh -restore -build -build-extension -ci -pack -bl -p:InstallBrowsersForPlaywright=false -p:SkipTestProjects=true ${{ inputs.versionOverrideArg }}
3129

3230
- name: Stage RID-specific NuGets and remaining packages

.github/workflows/copilot-setup-steps.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818

1919
- name: Build solution
20-
env:
21-
# prevent GitInfo errors
22-
CI: false
2320
# a full build is too slow; also do not fail on errors, continue so that
2421
# copilot can attempt to recover
2522
run: ./build.sh -restore || true

.github/workflows/generate-api-diffs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
2323
# Find all csproj files excluding specific paths
2424
find src -name '*.csproj' | egrep -v 'Aspire.ProjectTemplates|Aspire.Cli' | while read proj; do
25-
export CI=false && ./dotnet.sh build "$proj" -f net8.0 --configuration Release --no-incremental /t:"Build;GenAPIGenerateReferenceAssemblySource"
25+
./dotnet.sh build "$proj" -f net8.0 --configuration Release --no-incremental /t:"Build;GenAPIGenerateReferenceAssemblySource"
2626
done
2727
continue-on-error: true
2828

.github/workflows/refresh-manifests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323

2424
- name: Run RefreshManifests Script
2525
shell: pwsh
26-
env:
27-
CI: false
2826
run: |
2927
./eng/refreshManifests.ps1
3028

.github/workflows/run-tests.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ jobs:
172172
173173
- name: Install sdk for nuget based testing
174174
if: ${{ inputs.requiresTestSdk }}
175-
env:
176-
CI: false
177175
run: >
178176
${{ env.DOTNET_SCRIPT }} build ${{ github.workspace }}/tests/workloads.proj
179177
/p:SkipPackageCheckForTemplatesTesting=true
@@ -188,8 +186,6 @@ jobs:
188186
- name: Compute test project path
189187
id: compute_project_path
190188
shell: pwsh
191-
env:
192-
CI: false
193189
run: |
194190
$testShortName = "${{ inputs.testShortName }}"
195191
$overrideTestProjectPath = "${{ inputs.testProjectPath }}"
@@ -213,8 +209,6 @@ jobs:
213209
214210
- name: Build test project
215211
if: ${{ ! inputs.requiresNugets }}
216-
env:
217-
CI: false
218212
run: >
219213
${{ env.BUILD_SCRIPT }}
220214
-restore
@@ -226,8 +220,6 @@ jobs:
226220
227221
- name: Build and archive test project
228222
if: ${{ inputs.requiresNugets }}
229-
env:
230-
CI: false
231223
run: >
232224
${{ env.BUILD_SCRIPT }} -restore -ci -build -projects ${{ env.TEST_PROJECT_PATH }}
233225
/p:PrepareForHelix=true
@@ -238,8 +230,6 @@ jobs:
238230
# Workaround for bug in Azure Functions Worker SDK. See https://github.com/Azure/azure-functions-dotnet-worker/issues/2969.
239231
- name: Rebuild for Azure Functions project
240232
if: inputs.testShortName == 'Playground'
241-
env:
242-
CI: false
243233
run: |
244234
${{ env.DOTNET_SCRIPT }} build ${{ github.workspace }}/playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/AzureFunctionsEndToEnd.Functions.csproj /p:SkipUnstableEmulators=true
245235
@@ -284,7 +274,6 @@ jobs:
284274
if: ${{ inputs.requiresNugets }}
285275
working-directory: ${{ github.workspace }}/run-tests/
286276
env:
287-
CI: false
288277
DCP_DIAGNOSTICS_LOG_LEVEL: debug
289278
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
290279
BUILT_NUGETS_PATH: ${{ github.workspace }}/artifacts/packages/Debug/Shipping
@@ -308,7 +297,6 @@ jobs:
308297
if: ${{ ! inputs.requiresNugets }}
309298
id: run-tests
310299
env:
311-
CI: false
312300
DCP_DIAGNOSTICS_LOG_LEVEL: debug
313301
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
314302
# During restore and build, we use -ci, which causes NUGET_PACKAGES to point to a local cache (Arcade behavior).
@@ -402,8 +390,6 @@ jobs:
402390
403391
- name: Generate test results summary
404392
if: always()
405-
env:
406-
CI: false
407393
shell: pwsh
408394
run: |
409395
if (Test-Path "${{ github.workspace }}/testresults") {

.github/workflows/specialized-test-runner.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
--build
4646
-c Release
4747
--ci
48-
/p:CI=false
4948
/p:GeneratePackageOnBuild=false
5049
${{ !inputs.enablePlaywrightInstall && '/p:InstallBrowsersForPlaywright=false' || '' }}
5150
@@ -58,7 +57,6 @@ jobs:
5857
${{ inputs.extraRunSheetBuilderArgs }}
5958
-c Release
6059
--ci
61-
/p:CI=false
6260
/p:Restore=false
6361
/p:Build=false
6462
/bl:${{ github.workspace }}/artifacts/log/Release/runsheet.binlog
@@ -151,8 +149,6 @@ jobs:
151149
152150
- name: Generate test results summary
153151
if: steps.check_tests.outputs.tests_run == 'true'
154-
env:
155-
CI: false
156152
run: >
157153
${{ github.workspace }}/dotnet.sh
158154
run

.github/workflows/tests-runner.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
- name: Build with packages
6969
run: |
70-
./build.cmd -restore -build -pack -c Release -ci -bl /p:InstallBrowsersForPlaywright=false /p:SkipTestProjects=true /p:CI=false
70+
./build.cmd -restore -build -pack -c Release -ci -bl /p:InstallBrowsersForPlaywright=false /p:SkipTestProjects=true
7171
7272
- name: Generate test runsheet
7373
id: generate_e2e_matrix
@@ -121,8 +121,6 @@ jobs:
121121
sudo apt-get install -y azure-functions-core-tools-4
122122
123123
- name: Test ${{ matrix.tests.label }}
124-
env:
125-
CI: false
126124
run: |
127125
${{ matrix.tests.command }}
128126
@@ -186,7 +184,6 @@ jobs:
186184
187185
- name: Test ${{ matrix.tests.label }}
188186
env:
189-
CI: false
190187
BUILT_NUGETS_PATH: ${{ github.workspace }}/artifacts/packages/Release/Shipping
191188
run: |
192189
${{ matrix.tests.command }}

.github/workflows/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ jobs:
242242

243243
- name: Generate test results summary
244244
if: always()
245-
env:
246-
CI: false
247245
run: >
248246
${{ github.workspace }}/dotnet.sh
249247
run

0 commit comments

Comments
 (0)