Skip to content

Commit 3aa8a8b

Browse files
bart-vmwarebart-vmware
committed
Combine tests per target framework
1 parent 9b3f2d5 commit 3aa8a8b

3 files changed

Lines changed: 12 additions & 50 deletions

File tree

‎.github/workflows/Steeltoe.All.yml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,11 @@ jobs:
9696
echo SKIP_FILTER_NO_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0} --filter-not-trait Category=MemoryDumps', matrix.skipFilter) || '--filter-not-trait Category=MemoryDumps' }}" >> $GITHUB_ENV
9797
echo SKIP_FILTER_WITH_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0} --filter-trait Category=MemoryDumps', matrix.skipFilter) || '--filter-trait Category=MemoryDumps' }}" >> $GITHUB_ENV
9898
99-
- name: Test (net10.0)
100-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net10.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
99+
- name: Test
100+
run: dotnet test --solution ${{ env.SOLUTION_FILE }} ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
101101

102-
- name: Test (net10.0) (memory dumps)
103-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net10.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
104-
105-
- name: Test (net9.0)
106-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
107-
108-
- name: Test (net9.0) (memory dumps)
109-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
110-
111-
- name: Test (net8.0)
112-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
113-
114-
- name: Test (net8.0) (memory dumps)
115-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
102+
- name: Test (memory dumps)
103+
run: dotnet test --solution ${{ env.SOLUTION_FILE }} ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
116104

117105
- name: Upload crash/hang dumps (on failure)
118106
if: ${{ failure() }}

‎.github/workflows/component-shared-workflow.yml‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,26 +87,12 @@ jobs:
8787
- name: Build solution
8888
run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
8989

90-
- name: Test (net10.0)
91-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net10.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
90+
- name: Test
91+
run: dotnet test --solution ${{ env.SOLUTION_FILE }} ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
9292

93-
- name: Test (net10.0) (memory dumps)
93+
- name: Test (memory dumps)
9494
if: ${{ inputs.component == 'Management' }}
95-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net10.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
96-
97-
- name: Test (net9.0)
98-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
99-
100-
- name: Test (net9.0) (memory dumps)
101-
if: ${{ inputs.component == 'Management' }}
102-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
103-
104-
- name: Test (net8.0)
105-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
106-
107-
- name: Test (net8.0) (memory dumps)
108-
if: ${{ inputs.component == 'Management' }}
109-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
95+
run: dotnet test --solution ${{ env.SOLUTION_FILE }} ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
11096

11197
- name: Upload crash/hang dumps (on failure)
11298
if: ${{ failure() }}

‎.github/workflows/sonarcube.yml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,11 @@ jobs:
8080
- name: Build solution
8181
run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
8282

83-
- name: Test (net10.0)
84-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-not-trait "Category=MemoryDumps" --framework net10.0 ${{ env.SONAR_TEST_ARGS }}
83+
- name: Test
84+
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-not-trait "Category=MemoryDumps" ${{ env.SONAR_TEST_ARGS }}
8585

86-
- name: Test (net10.0) (memory dumps)
87-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-trait "Category=MemoryDumps" --framework net10.0 ${{ env.SONAR_TEST_ARGS }}
88-
89-
- name: Test (net9.0)
90-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-not-trait "Category=MemoryDumps" --framework net9.0 ${{ env.SONAR_TEST_ARGS }}
91-
92-
- name: Test (net9.0) (memory dumps)
93-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-trait "Category=MemoryDumps" --framework net9.0 ${{ env.SONAR_TEST_ARGS }}
94-
95-
- name: Test (net8.0)
96-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-not-trait "Category=MemoryDumps" --framework net8.0 ${{ env.SONAR_TEST_ARGS }}
97-
98-
- name: Test (net8.0) (memory dumps)
99-
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-trait "Category=MemoryDumps" --framework net8.0 ${{ env.SONAR_TEST_ARGS }}
86+
- name: Test (memory dumps)
87+
run: dotnet test --solution ${{ env.SOLUTION_FILE }} --filter-trait "Category=MemoryDumps" ${{ env.SONAR_TEST_ARGS }}
10088

10189
- name: End Sonar .NET scanner
10290
if: ${{ !cancelled() && steps.sonar_begin.outcome == 'success' }}

0 commit comments

Comments
 (0)