Merge remote-tracking branch 'origin/master' into SNOW-850068-remove-…

…deprecated-parser-and-downloader # Conflicts: # Snowflake.Data.Tests/UnitTests/ChunkDeserializerTest.cs # Snowflake.Data.Tests/UnitTests/ChunkDownloaderFactoryTest.cs # Snowflake.Data.Tests/UnitTests/ChunkParserFactoryTest.cs # Snowflake.Data.Tests/UnitTests/ChunkStreamingParserTest.cs # Snowflake.Data/Core/ChunkDeserializer.cs # Snowflake.Data/Core/ChunkStreamingParser.cs # Snowflake.Data/Core/SFBlockingChunkDownloader.cs # Snowflake.Data/Core/SFChunkDownloaderV2.cs
snowflakedb · Feb 14, 2024 · 9529b9d · 9529b9d
2 parents d98d01d + a1f1d6f
commit 9529b9d
Show file tree

Hide file tree

Showing 133 changed files with 12,138 additions and 2,699 deletions.
diff --git a/.github/workflows/jira_comment.yml b/.github/workflows/jira_comment.yml
@@ -23,7 +23,7 @@ jobs:
           echo ::set-output name=jira::$jira
       - name: Comment on issue
         uses: atlassian/gajira-comment@master
-        if: startsWith(steps.extract.outputs.jira, 'SNOW-')
+        if: startsWith(steps.extract.outputs.jira, 'SNOW-') && github.event.comment.user.login != 'codecov[bot]'
         with:
           issue: "${{ steps.extract.outputs.jira }}"
           comment: "${{ github.event.comment.user.login }} commented:\n\n${{ github.event.comment.body }}\n\n${{ github.event.comment.html_url }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,6 +24,8 @@ concurrency:
 env:
   DOTNET_VERSION: 6.0
   DOTNET_LEGACY_VERSION: 4.7.1
+  # uncomment to run the tests sequentially
+  #SEQUENTIAL_ENV: SEQUENTIAL_TEST_RUN
 
 jobs:
   test-windows:
@@ -62,7 +64,7 @@ jobs:
       - name: Run Tests
         run: |
           cd Snowflake.Data.Tests
-          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build" --output windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura
+          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
         env:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
@@ -76,12 +78,13 @@ jobs:
         with:
           name: tests-performance
           path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
-  #disable Code coverage for now as codecov is deprecated
-  #https://docs.codecov.com/docs/deprecated-uploader-migration-guide#python-uploader
-  #      - name: Install Codecov
-  #        run: pip install codecov
-  #      - name: Run Codecoverage
-  #        run: codecov -f Snowflake.Data.Tests\${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml -t ffc6a21d-8176-4849-9047-e3a631dcd35a
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          # without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
+          token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
+          fail_ci_if_error: true
+          files: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
 
   test-linux:
     name: Tests on Linux
@@ -118,7 +121,7 @@ jobs:
       - name: Run Tests
         run: |
           cd Snowflake.Data.Tests
-          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build" --output linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura
+          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
         env:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
@@ -132,6 +135,13 @@ jobs:
         with:
           name: tests-performance
           path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          # without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
+          token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
+          fail_ci_if_error: true
+          files: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
 
   test-mac:
     name: Tests on MAC
@@ -168,7 +178,7 @@ jobs:
       - name: Run Tests
         run: |
           cd Snowflake.Data.Tests
-          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build" --output macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura
+          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
         env:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
@@ -182,3 +192,10 @@ jobs:
         with:
           name: tests-performance
           path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          # without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
+          token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
+          fail_ci_if_error: true
+          files: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
diff --git a/.gitignore b/.gitignore
@@ -304,3 +304,8 @@ wss-unified-agent.jar
 whitesource/
 /testEnvironments.json
 /parameters.json
+
+# Test performance reports
+Snowflake.Data.Tests/macos_*_performance.csv
+Snowflake.Data.Tests/windows_*_performance.csv
+Snowflake.Data.Tests/unix_*_performance.csv