Skip to content

Commit f715cb2

Browse files
sfc-gh-jmartinezramirezsfc-gh-jmartinezramirez
committed
Update reports names to include package version
1 parent 3a6ff67 commit f715cb2

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
@@ -73,27 +73,28 @@ jobs:
7373
- name: Run Tests
7474
run: |
7575
cd Snowflake.Data.Tests
76-
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
76+
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
7777
env:
7878
snowflake_cloud_env: ${{ matrix.cloud_env }}
79+
pkg_version: ${{ matrix.pkg_version }}
7980
net_version: ${{ matrix.dotnet }}
8081
- name: Upload Code Coverage Report
8182
uses: actions/upload-artifact@v3
8283
with:
8384
name: code-coverage-report
84-
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
85+
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
8586
- name: Upload Test Performance Report
8687
uses: actions/upload-artifact@v3
8788
with:
8889
name: tests-performance
89-
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
90+
path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_performance.csv
9091
- name: Upload coverage reports to Codecov
9192
uses: codecov/codecov-action@v3
9293
with:
9394
# without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
9495
token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
9596
fail_ci_if_error: true
96-
files: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
97+
files: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
9798

9899
test-linux:
99100
name: Tests on Linux
@@ -103,6 +104,7 @@ jobs:
103104
matrix:
104105
dotnet: ['net6.0']
105106
cloud_env: ['AZURE', 'GCP', 'AWS']
107+
pkg_version: ['current']
106108
steps:
107109
- uses: actions/checkout@v3
108110
- name: Setup Dotnet
@@ -130,27 +132,28 @@ jobs:
130132
- name: Run Tests
131133
run: |
132134
cd Snowflake.Data.Tests
133-
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
135+
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
134136
env:
135137
snowflake_cloud_env: ${{ matrix.cloud_env }}
138+
pkg_version: ${{ matrix.pkg_version }}
136139
net_version: ${{ matrix.dotnet }}
137140
- name: Upload Code Coverage Report
138141
uses: actions/upload-artifact@v3
139142
with:
140143
name: code-coverage-report
141-
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
144+
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
142145
- name: Upload Test Performance Report
143146
uses: actions/upload-artifact@v3
144147
with:
145148
name: tests-performance
146-
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
149+
path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_performance.csv
147150
- name: Upload coverage reports to Codecov
148151
uses: codecov/codecov-action@v3
149152
with:
150153
# without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
151154
token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
152155
fail_ci_if_error: true
153-
files: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
156+
files: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
154157

155158
test-mac:
156159
name: Tests on MAC
@@ -160,6 +163,7 @@ jobs:
160163
matrix:
161164
dotnet: ['net6.0']
162165
cloud_env: ['AZURE', 'GCP', 'AWS']
166+
pkg_version: ['current']
163167
steps:
164168
- uses: actions/checkout@v3
165169
- name: Setup Dotnet
@@ -187,24 +191,25 @@ jobs:
187191
- name: Run Tests
188192
run: |
189193
cd Snowflake.Data.Tests
190-
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
194+
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
191195
env:
192196
snowflake_cloud_env: ${{ matrix.cloud_env }}
197+
pkg_version: ${{ matrix.pkg_version }}
193198
net_version: ${{ matrix.dotnet }}
194199
- name: Upload Code Coverage Report
195200
uses: actions/upload-artifact@v3
196201
with:
197202
name: code-coverage-report
198-
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
203+
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_coverage.xml
199204
- name: Upload Test Performance Report
200205
uses: actions/upload-artifact@v3
201206
with:
202207
name: tests-performance
203-
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
208+
path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_${{ matrix.pkg_version }}_performance.csv
204209
- name: Upload coverage reports to Codecov
205210
uses: codecov/codecov-action@v3
206211
with:
207212
# without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
208213
token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
209214
fail_ci_if_error: true
210-
files: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
215+
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)