Skip to content

Commit 84d40c6

Browse files
committed
After-merge workflows update
- target .net version updated - base branch updated in various filters - ifs and branch filters - change path filters of some workflows - added new auto-test workflow
1 parent 16c4358 commit 84d40c6

16 files changed

+926
-176
lines changed

.github/workflows/auto-databaseless-tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Core tests triggered by '${{ github.event_name }}'. Run No ${{ github.
44
on:
55
push:
66
branches:
7-
- '6.0'
8-
- '6.0-*'
7+
- '7.0'
8+
- '7.0-*'
99
paths:
1010
# extensions
1111
- 'Extensions/Xtensive.Orm.Logging.log4net/**'
@@ -32,7 +32,7 @@ on:
3232

3333
pull_request:
3434
branches:
35-
- '6.0'
35+
- '7.0'
3636
paths:
3737
# extensions
3838
- 'Extensions/Xtensive.Orm.Logging.log4net/**'
@@ -59,7 +59,7 @@ on:
5959

6060
pull_request_review:
6161
branches:
62-
- '6.0'
62+
- '7.0'
6363
paths:
6464
# extensions
6565
- 'Extensions/Xtensive.Orm.Logging.log4net/**'
@@ -99,7 +99,7 @@ jobs:
9999
name: Core Tests
100100
strategy:
101101
matrix:
102-
net: [ 'netcoreapp2.0' ]
102+
net: [ 'netcoreapp3.1' ]
103103
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
104104
#
105105
# push filter - to cover pushes from the team to main branch of major version
@@ -110,13 +110,13 @@ jobs:
110110
github.event_name == 'push'
111111
|| (github.event_name == 'pull_request_review'
112112
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
113-
&& startsWith(github.event.pull_request.base.ref, '6.0')
113+
&& startsWith(github.event.pull_request.base.ref, '7.0')
114114
&& github.event.review.state == 'approved')
115115
|| (github.event_name == 'pull_request'
116116
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
117-
&& !startsWith(github.head_ref, '6.0-'))
117+
&& !startsWith(github.head_ref, '7.0-'))
118118
119-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-independant-tests.yml@6.0
119+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-independant-tests.yml@7.0
120120
with:
121121
storage: sqlite3
122122
build_config: Release

.github/workflows/auto-firebird3-tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on Firebird 3 tests triggered by '${{ github.event_name }}'. Run
44
on:
55
push:
66
branches:
7-
- '6.0'
8-
- '6.0-*'
7+
- '7.0'
8+
- '7.0-*'
99
paths:
1010
# containers
1111
- 'Containers/firebird/do-firebird-3_0'
@@ -50,7 +50,7 @@ on:
5050

5151
pull_request:
5252
branches:
53-
- '6.0'
53+
- '7.0'
5454
paths:
5555
# containers
5656
- 'Containers/firebird/do-firebird-3_0'
@@ -95,7 +95,7 @@ on:
9595

9696
pull_request_review:
9797
branches:
98-
- '6.0'
98+
- '7.0'
9999
paths:
100100
# containers
101101
- 'Containers/firebird/do-firebird-3_0'
@@ -153,7 +153,7 @@ jobs:
153153
name: Tests on Firebird 3
154154
strategy:
155155
matrix:
156-
net: [ 'netcoreapp2.0' ]
156+
net: [ 'netcoreapp3.1' ]
157157
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
158158
#
159159
# push filter - to cover pushes from the team to main branch of major version
@@ -164,12 +164,12 @@ jobs:
164164
github.event_name == 'push'
165165
|| (github.event_name == 'pull_request_review'
166166
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
167-
&& startsWith(github.event.pull_request.base.ref, '6.0')
167+
&& startsWith(github.event.pull_request.base.ref, '7.0')
168168
&& github.event.review.state == 'approved')
169169
|| (github.event_name == 'pull_request'
170170
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
171-
&& !startsWith(github.head_ref, '6.0-'))
172-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@6.0
171+
&& !startsWith(github.head_ref, '7.0-'))
172+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.0
173173
with:
174174
storage: firebird30
175175
build_config: Release

.github/workflows/auto-mssql2017-tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on MS SQL Server 2017 tests triggered by '${{ github.event_name
44
on:
55
push:
66
branches:
7-
- '6.0'
8-
- '6.0-*'
7+
- '7.0'
8+
- '7.0-*'
99
paths:
1010
# containers
1111
- 'Containers/mssql/do-mssql-2017'
@@ -38,7 +38,7 @@ on:
3838
- 'TestFileForBuildServerTests.txt'
3939
pull_request:
4040
branches:
41-
- '6.0'
41+
- '7.0'
4242
paths:
4343
# containers
4444
- 'Containers/mssql/do-mssql-2017'
@@ -72,7 +72,7 @@ on:
7272

7373
pull_request_review:
7474
branches:
75-
- '6.0'
75+
- '7.0'
7676
paths:
7777
# containers
7878
- 'Containers/mssql/do-mssql-2017'
@@ -119,7 +119,7 @@ jobs:
119119
name: Tests on MS SQL Server 2017
120120
strategy:
121121
matrix:
122-
net: [ 'netcoreapp2.0' ]
122+
net: [ 'netcoreapp3.1' ]
123123
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
124124
#
125125
# push filter - to cover pushes from the team to main branch of major version
@@ -130,12 +130,12 @@ jobs:
130130
github.event_name == 'push'
131131
|| (github.event_name == 'pull_request_review'
132132
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
133-
&& startsWith(github.event.pull_request.base.ref, '6.0')
133+
&& startsWith(github.event.pull_request.base.ref, '7.0')
134134
&& github.event.review.state == 'approved')
135135
|| (github.event_name == 'pull_request'
136136
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
137-
&& !startsWith(github.head_ref, '6.0-'))
138-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@6.0
137+
&& !startsWith(github.head_ref, '7.0-'))
138+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.0
139139
with:
140140
storage: mssql2017
141141
build_config: Release

.github/workflows/auto-mssql2019-tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ run-name: Tests on MS SQL Server 2019 tests triggered by '${{ github.event_name
44
on:
55
push:
66
branches:
7-
- '6.0'
8-
- '6.0-*'
7+
- '7.0'
8+
- '7.0-*'
99
paths:
1010
# containers
1111
- 'Containers/mssql/do-mssql-2019'
@@ -47,7 +47,7 @@ on:
4747

4848
pull_request:
4949
branches:
50-
- '6.0'
50+
- '7.0'
5151
paths:
5252
# containers
5353
- 'Containers/mssql/do-mssql-2019'
@@ -89,7 +89,7 @@ on:
8989

9090
pull_request:
9191
branches:
92-
- '6.0'
92+
- '7.0'
9393
paths:
9494
# containers
9595
- 'Containers/mssql/do-mssql-2019'
@@ -144,7 +144,7 @@ jobs:
144144
name: Tests on MS SQL Server 2019
145145
strategy:
146146
matrix:
147-
net: [ 'netcoreapp2.0' ]
147+
net: [ 'netcoreapp3.1' ]
148148
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
149149
#
150150
# push filter - to cover pushes from the team to main branch of major version
@@ -155,12 +155,12 @@ jobs:
155155
github.event_name == 'push'
156156
|| (github.event_name == 'pull_request_review'
157157
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
158-
&& startsWith(github.event.pull_request.base.ref, '6.0')
158+
&& startsWith(github.event.pull_request.base.ref, '7.0')
159159
&& github.event.review.state == 'approved')
160160
|| (github.event_name == 'pull_request'
161161
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
162-
&& !startsWith(github.head_ref, '6.0-'))
163-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@6.0
162+
&& !startsWith(github.head_ref, '7.0-'))
163+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.0
164164
with:
165165
storage: mssql2019
166166
build_config: Release
Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
name: ⚙📚 Automated MS SQL Server 2022 tests
2+
run-name: Tests on MS SQL Server 2022 tests triggered by '${{ github.event_name }}'. Run No ${{ github.run_number }}.
3+
4+
on:
5+
push:
6+
branches:
7+
- '7.0'
8+
- '7.0-*'
9+
paths:
10+
# containers
11+
- 'Containers/mssql/do-mssql-2022'
12+
- 'Containers/mssql/**.sh'
13+
- 'Containers/mssql/**.sql'
14+
# main project - most common part, that may have changes that affect
15+
- 'Orm/Xtensive.Orm/Orm/Providers/**'
16+
- 'Orm/Xtensive.Orm/Orm/Rse/**'
17+
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
18+
- 'Orm/Xtensive.Orm/Sql/**'
19+
# provider
20+
- 'Orm/Xtensive.Orm.SqlServer/**'
21+
- '!Orm/Xtensive.Orm.SqlServer/**.csproj'
22+
- '!Orm/Xtensive.Orm.SqlServer/NuGetContent/**'
23+
# main test project - any code change
24+
- 'Orm/Xtensive.Orm.Tests/Issues/**'
25+
- 'Orm/Xtensive.Orm.Tests/Storage/**'
26+
- 'Orm/Xtensive.Orm.Tests/Upgrade/**'
27+
# sql tests - general and provider-specific
28+
- 'Orm/Xtensive.Orm.Tests.Sql/**'
29+
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
30+
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
31+
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
32+
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
33+
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
34+
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
35+
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
36+
- '!Orm/Xtensive.Orm.Tests.Sql/**.csproj'
37+
# ability to trigger on demand
38+
- 'TestFileForBuildServerTests.txt'
39+
pull_request:
40+
branches:
41+
- '7.0'
42+
paths:
43+
# containers
44+
- 'Containers/mssql/do-mssql-2022'
45+
- 'Containers/mssql/**.sh'
46+
- 'Containers/mssql/**.sql'
47+
# main project - most common part, that may have changes that affect
48+
- 'Orm/Xtensive.Orm/Orm/Providers/**'
49+
- 'Orm/Xtensive.Orm/Orm/Rse/**'
50+
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
51+
- 'Orm/Xtensive.Orm/Sql/**'
52+
# provider
53+
- 'Orm/Xtensive.Orm.SqlServer/**'
54+
- '!Orm/Xtensive.Orm.SqlServer/**.csproj'
55+
- '!Orm/Xtensive.Orm.SqlServer/NuGetContent/**'
56+
# main test project - any code change
57+
- 'Orm/Xtensive.Orm.Tests/Issues/**'
58+
- 'Orm/Xtensive.Orm.Tests/Storage/**'
59+
- 'Orm/Xtensive.Orm.Tests/Upgrade/**'
60+
# sql tests - general and provider-specific
61+
- 'Orm/Xtensive.Orm.Tests.Sql/**'
62+
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
63+
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
64+
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
65+
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
66+
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
67+
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
68+
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
69+
- '!Orm/Xtensive.Orm.Tests.Sql/**.csproj'
70+
# ability to trigger on demand
71+
- 'TestFileForBuildServerTests.txt'
72+
73+
pull_request_review:
74+
branches:
75+
- '7.0'
76+
paths:
77+
# containers
78+
- 'Containers/mssql/do-mssql-2022'
79+
- 'Containers/mssql/**.sh'
80+
- 'Containers/mssql/**.sql'
81+
# main project - most common part, that may have changes that affect
82+
- 'Orm/Xtensive.Orm/Orm/Providers/**'
83+
- 'Orm/Xtensive.Orm/Orm/Rse/**'
84+
- 'Orm/Xtensive.Orm/Orm/Upgrade/**'
85+
- 'Orm/Xtensive.Orm/Sql/**'
86+
# provider
87+
- 'Orm/Xtensive.Orm.SqlServer/**'
88+
- '!Orm/Xtensive.Orm.SqlServer/**.csproj'
89+
- '!Orm/Xtensive.Orm.SqlServer/NuGetContent/**'
90+
# main test project - any code change
91+
- 'Orm/Xtensive.Orm.Tests/Issues/**'
92+
- 'Orm/Xtensive.Orm.Tests/Storage/**'
93+
- 'Orm/Xtensive.Orm.Tests/Upgrade/**'
94+
# sql tests - general and provider-specific
95+
- 'Orm/Xtensive.Orm.Tests.Sql/**'
96+
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
97+
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
98+
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
99+
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
100+
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
101+
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
102+
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
103+
- '!Orm/Xtensive.Orm.Tests.Sql/**.csproj'
104+
# ability to trigger on demand
105+
- 'TestFileForBuildServerTests.txt'
106+
107+
# new commits with the same key will cancel previously run workflows
108+
concurrency:
109+
group: ${{ github.workflow }}-${{ github.ref }}
110+
cancel-in-progress: true
111+
112+
permissions:
113+
contents: read
114+
actions: read
115+
checks: write
116+
117+
jobs:
118+
test_on_mssql2022:
119+
name: Tests on MS SQL Server 2022
120+
strategy:
121+
matrix:
122+
net: [ 'netcoreapp3.1' ]
123+
# For security reasons we allow test runs either for pushes from the team or for pull-requests after their changes were seen and approved by someone
124+
#
125+
# push filter - to cover pushes from the team to main branch of major version
126+
# first 'pull_request_review' filter - to cover external pull-requests, since there are major security concerns about content of pull-request we cannot allow auto-runs of tests
127+
# second 'pull_request_review' - to cover internal pull-requests that were not covered by 'on push' trigger
128+
#
129+
if: |
130+
github.event_name == 'push'
131+
|| (github.event_name == 'pull_request_review'
132+
&& github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
133+
&& startsWith(github.event.pull_request.base.ref, '7.0')
134+
&& github.event.review.state == 'approved')
135+
|| (github.event_name == 'pull_request'
136+
&& github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
137+
&& !startsWith(github.head_ref, '7.0-'))
138+
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@7.0
139+
with:
140+
storage: mssql2022
141+
build_config: Release
142+
target_framework: ${{ matrix.net }}
143+
test_output_verbosity: minimal
144+
test_run_timeout: 50
145+
run_main: true
146+
run_sql: true
147+
run_extensions: true
148+
publish_raw_results: false

0 commit comments

Comments
 (0)