Skip to content

Commit 55a1fa5

Browse files
sfc-gh-jmartinezramirezsfc-gh-jmartinezramirez
committed
Update reports names to include package version
1 parent dff02f6 commit 55a1fa5

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

‎.github/workflows/main.yml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,28 @@ jobs:
7474
- name: Run Tests
7575
run: |
7676
cd Snowflake.Data.Tests
77-
dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
77+
dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml --output-format cobertura --settings coverage.config
7878
env:
7979
snowflake_cloud_env: ${{ matrix.cloud_env }}
80+
pkg_version: ${{ matrix.pkg_version }}
8081
net_version: ${{ matrix.dotnet }}
8182
- name: Upload Code Coverage Report
8283
uses: actions/upload-artifact@v3
8384
with:
8485
name: code-coverage-report
85-
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
86+
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
8687
- name: Upload Test Performance Report
8788
uses: actions/upload-artifact@v3
8889
with:
8990
name: tests-performance
90-
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
91+
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_performance.csv
9192
- name: Upload coverage reports to Codecov
9293
uses: codecov/codecov-action@v3
9394
with:
9495
# without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
9596
token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
9697
fail_ci_if_error: true
97-
files: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
98+
files: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
9899

99100
test-linux:
100101
name: Tests on Linux
@@ -104,6 +105,7 @@ jobs:
104105
matrix:
105106
dotnet: ['net6.0']
106107
cloud_env: ['AZURE', 'GCP', 'AWS']
108+
pkg_version: ['current']
107109
steps:
108110
- uses: actions/checkout@v3
109111
- name: Setup Dotnet
@@ -131,27 +133,28 @@ jobs:
131133
- name: Run Tests
132134
run: |
133135
cd Snowflake.Data.Tests
134-
dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
136+
dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml --output-format cobertura --settings coverage.config
135137
env:
136138
snowflake_cloud_env: ${{ matrix.cloud_env }}
139+
pkg_version: ${{ matrix.pkg_version }}
137140
net_version: ${{ matrix.dotnet }}
138141
- name: Upload Code Coverage Report
139142
uses: actions/upload-artifact@v3
140143
with:
141144
name: code-coverage-report
142-
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
145+
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
143146
- name: Upload Test Performance Report
144147
uses: actions/upload-artifact@v3
145148
with:
146149
name: tests-performance
147-
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
150+
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_performance.csv
148151
- name: Upload coverage reports to Codecov
149152
uses: codecov/codecov-action@v3
150153
with:
151154
# without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
152155
token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
153156
fail_ci_if_error: true
154-
files: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
157+
files: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
155158

156159
test-mac:
157160
name: Tests on MAC
@@ -161,6 +164,7 @@ jobs:
161164
matrix:
162165
dotnet: ['net6.0']
163166
cloud_env: ['AZURE', 'GCP', 'AWS']
167+
pkg_version: ['current']
164168
steps:
165169
- uses: actions/checkout@v3
166170
- name: Setup Dotnet
@@ -188,24 +192,25 @@ jobs:
188192
- name: Run Tests
189193
run: |
190194
cd Snowflake.Data.Tests
191-
dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
195+
dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml --output-format cobertura --settings coverage.config
192196
env:
193197
snowflake_cloud_env: ${{ matrix.cloud_env }}
198+
pkg_version: ${{ matrix.pkg_version }}
194199
net_version: ${{ matrix.dotnet }}
195200
- name: Upload Code Coverage Report
196201
uses: actions/upload-artifact@v3
197202
with:
198203
name: code-coverage-report
199-
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
204+
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
200205
- name: Upload Test Performance Report
201206
uses: actions/upload-artifact@v3
202207
with:
203208
name: tests-performance
204-
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
209+
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_performance.csv
205210
- name: Upload coverage reports to Codecov
206211
uses: codecov/codecov-action@v3
207212
with:
208213
# without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
209214
token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
210215
fail_ci_if_error: true
211-
files: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
216+
files: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml

‎Snowflake.Data.Tests/SFBaseTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,13 @@ public void CreateTestTimeArtifact()
246246

247247
var dotnetVersion = Environment.GetEnvironmentVariable("net_version");
248248
var cloudEnv = Environment.GetEnvironmentVariable("snowflake_cloud_env");
249+
var pkgVersion = Environment.GetEnvironmentVariable("pgk_version");
249250

250251
var separator = Path.DirectorySeparatorChar;
251252

252253
// We have to go up 3 times as the working directory path looks as follows:
253254
// Snowflake.Data.Tests/bin/debug/{.net_version}/
254-
File.WriteAllText($"..{separator}..{separator}..{separator}{GetOs()}_{dotnetVersion}_{cloudEnv}_performance.csv", resultText);
255+
File.WriteAllText($"..{separator}..{separator}..{separator}{GetOs()}_{dotnetVersion}_{cloudEnv}_{pkgVersion}_performance.csv", resultText);
255256
}
256257

257258
private static string s_connectionString => string.Format(ConnectionStringFmt,

0 commit comments

Comments
 (0)