Skip to content

Commit 3e429c1

Browse files
committed
update CI setup (add new tests, add target_framework var)
1 parent 88876bf commit 3e429c1

File tree

2 files changed

+40
-20
lines changed

2 files changed

+40
-20
lines changed

.github/workflows/config.yml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on: [push]
44

55
env:
66
DOTNET_VERSION: 9.0.303
7+
TARGET_FRAMEWORK: net9.0
78
CONNECTOR_VERSION: 1.3.0
89
LICENSE_KEY: ${{ secrets.LICENSE_KEY }}
910
SQL_USER_PASSWORD: ${{ secrets.SQL_USER_PASSWORD }}
@@ -67,27 +68,40 @@ jobs:
6768
sed -i "s|SINGLESTORE_HOST|127.0.0.1|g" tests/SideBySide/config.json
6869
sed -i "s|SQL_USER_PASSWORD|${SQL_USER_PASSWORD}|g" tests/SideBySide/config.json
6970
sed -i "s|SQL_USER_NAME|root|g" tests/SideBySide/config.json
70-
mkdir -p /home/runner/work/SingleStoreNETConnector/SingleStoreNETConnector/artifacts/bin/SideBySide/release_net9.0/
71-
cp tests/SideBySide/config.json /home/runner/work/SingleStoreNETConnector/SingleStoreNETConnector/artifacts/bin/SideBySide/release_net9.0/config.json
71+
mkdir -p /home/runner/work/SingleStoreNETConnector/SingleStoreNETConnector/artifacts/bin/SideBySide/release_${{ env.TARGET_FRAMEWORK }}/
72+
cp tests/SideBySide/config.json /home/runner/work/SingleStoreNETConnector/SingleStoreNETConnector/artifacts/bin/SideBySide/release_${{ env.TARGET_FRAMEWORK }}/config.json
7273
7374
- name: Run Unit tests
7475
run: |
7576
cd tests/SingleStoreConnector.Tests
76-
dotnet test -f net9.0 -c Release --no-build
77+
dotnet test -f ${{ env.TARGET_FRAMEWORK }} -c Release --no-build
7778
cd ../../
7879
7980
- name: Run Conformance tests
8081
run: |
8182
cd tests/Conformance.Tests
82-
dotnet test -f net9.0 -c Release --no-build
83+
dotnet test -f ${{ env.TARGET_FRAMEWORK }} -c Release --no-build
84+
cd ../../
85+
86+
- name: Run DependencyInjection tests
87+
run: |
88+
cd tests/SingleStoreConnector.DependencyInjection.Tests
89+
dotnet test -f ${{ env.TARGET_FRAMEWORK }} -c Release --no-build
90+
cd ../../
91+
92+
- name: Run NativeAot tests
93+
run: |
94+
cd tests/SingleStoreConnector.NativeAot.Tests
95+
dotnet run -f ${{ env.TARGET_FRAMEWORK }} -c Release
8396
cd ../../
8497
8598
- name: Run SideBySide tests
8699
run: |
87100
cd tests/SideBySide
88-
dotnet test -f net9.0 -c Release --no-build
101+
dotnet test -f ${{ env.TARGET_FRAMEWORK }} -c Release --no-build
89102
cd ../../
90103
104+
91105
test-windows:
92106
runs-on: windows-latest
93107
strategy:
@@ -117,13 +131,19 @@ jobs:
117131
run: echo "CONNECTION_STRING=$(< $HOME/CONNECTION_STRING)" >> $GITHUB_ENV
118132

119133
- name: Run Unit tests
120-
run: .\.github\workflows\run-test-windows.ps1 -test_block SingleStoreConnector.Tests -target_framework net9.0
134+
run: .\.github\workflows\run-test-windows.ps1 -test_block SingleStoreConnector.Tests -target_framework ${{ env.TARGET_FRAMEWORK }}
121135

122136
- name: Run Conformance tests
123-
run: .\.github\workflows\run-test-windows.ps1 -test_block Conformance.Tests -target_framework net9.0
137+
run: .\.github\workflows\run-test-windows.ps1 -test_block Conformance.Tests -target_framework ${{ env.TARGET_FRAMEWORK }}
138+
139+
- name: Run DependencyInjection tests
140+
run: .\.github\workflows\run-test-windows.ps1 -test_block SingleStoreConnector.DependencyInjection.Tests -target_framework ${{ env.TARGET_FRAMEWORK }}
141+
142+
- name: Run NativeAot tests
143+
run: dotnet run --project tests/SingleStoreConnector.NativeAot.Tests --framework ${{ env.TARGET_FRAMEWORK }} --configuration Release
124144

125145
- name: Run SideBySide tests
126-
run: .\.github\workflows\run-test-windows.ps1 -test_block SideBySide -target_framework net9.0
146+
run: .\.github\workflows\run-test-windows.ps1 -test_block SideBySide -target_framework ${{ env.TARGET_FRAMEWORK }}
127147

128148
- name: Terminate test cluster
129149
if: always()

tests/SingleStoreConnector.NativeAot.Tests/packages.lock.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"net8.0": {
55
"Microsoft.DotNet.ILCompiler": {
66
"type": "Direct",
7-
"requested": "[8.0.13, )",
8-
"resolved": "8.0.13",
9-
"contentHash": "CCIhseY9KUJDIYKt7qD1IRLQA6Hr/8Dky31KS6UrM2sFyaFUb2JLagT0Uy2BiSf1i1Qy3nPjRb0zc1JFogOi9w=="
7+
"requested": "[8.0.15, )",
8+
"resolved": "8.0.15",
9+
"contentHash": "wMf2N7fJ846aKd73R5gqvtbyqu89/LywlWCtMyXUqKYc9DR3s9kUgNrLIsT9KeRwyinGFJDtRbiib0M4YBX6ZA=="
1010
},
1111
"Microsoft.NET.ILLink.Tasks": {
1212
"type": "Direct",
13-
"requested": "[8.0.13, )",
14-
"resolved": "8.0.13",
15-
"contentHash": "R19ZTaRiQAK+xo9ZwaHbF/1vb1wwR1Wn5+sqp9v8+CDjbdS8R6qftKdw0VSXWKm7VAMi7P+NCU4zxDzhEWcAwQ=="
13+
"requested": "[8.0.15, )",
14+
"resolved": "8.0.15",
15+
"contentHash": "s4eXlcRGyHeCgFUGQnhq0e/SCHBPp0jOHgMqZg3fQ2OCHJSm1aOUhI6RFWuVIcEb9ig2WgI2kWukk8wu72EbUQ=="
1616
},
1717
"Microsoft.SourceLink.GitHub": {
1818
"type": "Direct",
@@ -66,15 +66,15 @@
6666
"net9.0": {
6767
"Microsoft.DotNet.ILCompiler": {
6868
"type": "Direct",
69-
"requested": "[9.0.2, )",
70-
"resolved": "9.0.2",
71-
"contentHash": "eyIUUqqPy7brzmoV04zabOUm0puEAAjZd3O3vuzan9iTTh0oIPwts8fLxZFoEZCFi63ACFtHbNBs5Y7myB3ZDQ=="
69+
"requested": "[9.0.4, )",
70+
"resolved": "9.0.4",
71+
"contentHash": "G85txKEuQ8s64BG9Pk3TbmE+cDgKReepnIPNfC1lNks4u2v5SkQhjCuuSAep+H2xtgFpYU7w9LFOF+vVtJZguA=="
7272
},
7373
"Microsoft.NET.ILLink.Tasks": {
7474
"type": "Direct",
75-
"requested": "[9.0.2, )",
76-
"resolved": "9.0.2",
77-
"contentHash": "+KFnCLVPicEq99ko0tq+ycTvNLXHw0tImmTZjPloB/DOFLPT56KLfk5aS7wbgXRPzYhXTTBYLGaABea5mke77w=="
75+
"requested": "[9.0.4, )",
76+
"resolved": "9.0.4",
77+
"contentHash": "xUdlUxiFwXhTYhB4VxKg/IA0+jlZXJPo70LYuMryWbJHdonIpZjw+7DO2B0pWwpXIOs6MlH5WVXPEtfrGEcVZA=="
7878
},
7979
"Microsoft.SourceLink.GitHub": {
8080
"type": "Direct",

0 commit comments

Comments
 (0)