Skip to content

Commit e4bb1d3

Browse files
alex-kulakovalex-kulakov
committed
Merge branch '7.0' into 7.1
# Conflicts: # .github/workflows/dispatched-mysql5-tests.yml
2 parents 58eb026 + 689369e commit e4bb1d3

10 files changed

+25
-88
lines changed

‎.github/workflows/dispatched-build.yml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ on:
2727
required: false
2828
default: ''
2929
type: string
30-
fetch_depth:
31-
description: 'Depth of repo fetch (change if SHA populated)'
32-
required: false
33-
default: 1
34-
type: number
3530
publish_artifacts:
3631
description: 'Publish artifacts'
3732
required: true
@@ -54,15 +49,25 @@ jobs:
5449
BUILD_CONFIG: ${{ inputs.buildConfiguration }}
5550
BUILD_NUMBER: ${{ github.run_number }}
5651
steps:
57-
- name: Checkout repo
52+
- name: Checkout repo (last commit)
53+
if: ${{ inputs.specific_sha == '' || github.reg_type != 'branch' }}
54+
timeout-minutes: 1
55+
uses: actions/checkout@v4
56+
with:
57+
ref: ${{ github.ref_name }}
58+
59+
- name: Checkout repo (last 50 commit)
60+
if: ${{ inputs.specific_sha != '' && github.reg_type == 'branch' }}
5861
timeout-minutes: 1
5962
uses: actions/checkout@v4
6063
with:
61-
fetch-depth: ${{ inputs.fetch_depth }}
64+
ref: ${{ github.ref_name }}
65+
fetch-depth: 50
6266

63-
- name: Manual checkout
64-
if: ${{ inputs.specific_sha != '' }}
65-
run: git checkout ${{ inputs.specific_sha }}
67+
# it leads to detached HEAD, but we don't commit anything anyway
68+
- name: Manual commit checkout if required
69+
if: ${{ inputs.specific_sha != '' && github.reg_type == 'branch' }}
70+
run: git checkout ${{ inputs.specific_sha }}
6671

6772
- name: Build Orm
6873
if: ${{ success() }}

‎.github/workflows/dispatched-firebird-tests.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on Firebird on dispatch. Run No ${{ github.run_numb
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -57,7 +52,6 @@ jobs:
5752
build_config: Release
5853
target_framework: ${{ matrix.net }}
5954
specific_sha: ${{ inputs.specific_sha }}
60-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
6155
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
6256
test_output_verbosity: minimal
6357
test_run_timeout: 40
@@ -78,7 +72,6 @@ jobs:
7872
build_config: Release
7973
target_framework: ${{ matrix.net }}
8074
specific_sha: ${{ inputs.specific_sha }}
81-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
8275
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
8376
test_output_verbosity: minimal
8477
test_run_timeout: 40
@@ -99,7 +92,6 @@ jobs:
9992
build_config: Release
10093
target_framework: ${{ matrix.net }}
10194
specific_sha: ${{ inputs.specific_sha }}
102-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
10395
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
10496
test_output_verbosity: minimal
10597
test_run_timeout: 40

‎.github/workflows/dispatched-mssql-tests.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on MS SQL Server on dispatch. Run No ${{ github.run
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -57,7 +52,6 @@ jobs:
5752
build_config: Release
5853
target_framework: ${{ matrix.net }}
5954
specific_sha: ${{ inputs.specific_sha }}
60-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
6155
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
6256
test_output_verbosity: minimal
6357
test_run_timeout: 50
@@ -78,7 +72,6 @@ jobs:
7872
build_config: Release
7973
target_framework: ${{ matrix.net }}
8074
specific_sha: ${{ inputs.specific_sha }}
81-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
8275
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
8376
test_output_verbosity: minimal
8477
test_run_timeout: 50
@@ -99,7 +92,6 @@ jobs:
9992
build_config: Release
10093
target_framework: ${{ matrix.net }}
10194
specific_sha: ${{ inputs.specific_sha }}
102-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
10395
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
10496
test_output_verbosity: minimal
10597
test_run_timeout: 50

‎.github/workflows/dispatched-mysql5-tests.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on MySQL on dispatch. Run No ${{ github.run_number
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -57,7 +52,6 @@ jobs:
5752
build_config: Release
5853
target_framework: ${{ matrix.net }}
5954
specific_sha: ${{ inputs.specific_sha }}
60-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
6155
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
6256
test_output_verbosity: minimal
6357
test_run_timeout: 20
@@ -78,7 +72,6 @@ jobs:
7872
build_config: Release
7973
target_framework: ${{ matrix.net }}
8074
specific_sha: ${{ inputs.specific_sha }}
81-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
8275
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
8376
test_output_verbosity: minimal
8477
test_run_timeout: 30
@@ -99,7 +92,6 @@ jobs:
9992
build_config: Release
10093
target_framework: ${{ matrix.net }}
10194
specific_sha: ${{ inputs.specific_sha }}
102-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
10395
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
10496
test_output_verbosity: minimal
10597
test_run_timeout: 35

‎.github/workflows/dispatched-mysql8-tests.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on MySQL on dispatch. Run No ${{ github.run_number
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -67,7 +62,6 @@ jobs:
6762
build_config: Release
6863
target_framework: ${{ matrix.net }}
6964
specific_sha: ${{ inputs.specific_sha }}
70-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
7165
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
7266
test_output_verbosity: minimal
7367
test_run_timeout: 30
@@ -88,7 +82,6 @@ jobs:
8882
build_config: Release
8983
target_framework: ${{ matrix.net }}
9084
specific_sha: ${{ inputs.specific_sha }}
91-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
9285
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
9386
test_output_verbosity: minimal
9487
test_run_timeout: 30
@@ -109,7 +102,6 @@ jobs:
109102
build_config: Release
110103
target_framework: ${{ matrix.net }}
111104
specific_sha: ${{ inputs.specific_sha }}
112-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
113105
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
114106
test_output_verbosity: minimal
115107
test_run_timeout: 30
@@ -130,7 +122,6 @@ jobs:
130122
build_config: Release
131123
target_framework: ${{ matrix.net }}
132124
specific_sha: ${{ inputs.specific_sha }}
133-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
134125
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
135126
test_output_verbosity: minimal
136127
test_run_timeout: 30
@@ -151,7 +142,6 @@ jobs:
151142
build_config: Release
152143
target_framework: ${{ matrix.net }}
153144
specific_sha: ${{ inputs.specific_sha }}
154-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
155145
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
156146
test_output_verbosity: minimal
157147
test_run_timeout: 30

‎.github/workflows/dispatched-mysql9-tests.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on MySQL on dispatch. Run No ${{ github.run_number
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -62,7 +57,6 @@ jobs:
6257
build_config: Release
6358
target_framework: ${{ matrix.net }}
6459
specific_sha: ${{ inputs.specific_sha }}
65-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
6660
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
6761
test_output_verbosity: minimal
6862
test_run_timeout: 30
@@ -83,7 +77,6 @@ jobs:
8377
build_config: Release
8478
target_framework: ${{ matrix.net }}
8579
specific_sha: ${{ inputs.specific_sha }}
86-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
8780
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
8881
test_output_verbosity: minimal
8982
test_run_timeout: 30
@@ -104,7 +97,6 @@ jobs:
10497
build_config: Release
10598
target_framework: ${{ matrix.net }}
10699
specific_sha: ${{ inputs.specific_sha }}
107-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
108100
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
109101
test_output_verbosity: minimal
110102
test_run_timeout: 30
@@ -125,7 +117,6 @@ jobs:
125117
build_config: Release
126118
target_framework: ${{ matrix.net }}
127119
specific_sha: ${{ inputs.specific_sha }}
128-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
129120
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
130121
test_output_verbosity: minimal
131122
test_run_timeout: 30

‎.github/workflows/dispatched-pgsql10-tests.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on PostgreSQL on dispatch. Run No ${{ github.run_nu
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -82,7 +77,6 @@ jobs:
8277
build_config: Release
8378
target_framework: ${{ matrix.net }}
8479
specific_sha: ${{ inputs.specific_sha }}
85-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
8680
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
8781
test_output_verbosity: minimal
8882
test_run_timeout: 30
@@ -103,7 +97,6 @@ jobs:
10397
build_config: Release
10498
target_framework: ${{ matrix.net }}
10599
specific_sha: ${{ inputs.specific_sha }}
106-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
107100
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
108101
test_output_verbosity: minimal
109102
test_run_timeout: 30
@@ -124,7 +117,6 @@ jobs:
124117
build_config: Release
125118
target_framework: ${{ matrix.net }}
126119
specific_sha: ${{ inputs.specific_sha }}
127-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
128120
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
129121
test_output_verbosity: minimal
130122
test_run_timeout: 30
@@ -145,7 +137,6 @@ jobs:
145137
build_config: Release
146138
target_framework: ${{ matrix.net }}
147139
specific_sha: ${{ inputs.specific_sha }}
148-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
149140
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
150141
test_output_verbosity: minimal
151142
test_run_timeout: 30
@@ -166,7 +157,6 @@ jobs:
166157
build_config: Release
167158
target_framework: ${{ matrix.net }}
168159
specific_sha: ${{ inputs.specific_sha }}
169-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
170160
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
171161
test_output_verbosity: minimal
172162
test_run_timeout: 30
@@ -187,7 +177,6 @@ jobs:
187177
build_config: Release
188178
target_framework: ${{ matrix.net }}
189179
specific_sha: ${{ inputs.specific_sha }}
190-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
191180
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
192181
test_output_verbosity: minimal
193182
test_run_timeout: 30
@@ -208,7 +197,6 @@ jobs:
208197
build_config: Release
209198
target_framework: ${{ matrix.net }}
210199
specific_sha: ${{ inputs.specific_sha }}
211-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
212200
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
213201
test_output_verbosity: minimal
214202
test_run_timeout: 30
@@ -229,7 +217,6 @@ jobs:
229217
build_config: Release
230218
target_framework: ${{ matrix.net }}
231219
specific_sha: ${{ inputs.specific_sha }}
232-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
233220
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
234221
test_output_verbosity: minimal
235222
test_run_timeout: 30

‎.github/workflows/dispatched-pgsql9-tests.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on PostgreSQL on dispatch. Run No ${{ github.run_nu
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -55,7 +50,6 @@ jobs:
5550
# build_config: Release
5651
# target_frameworks: net6.0
5752
# specific_sha: ${{ inputs.specific_sha }}
58-
# fetch_depth: 1
5953
# test_output_verbosity: minimal
6054
# test_run_timeout: 70
6155
# run_main: true
@@ -75,7 +69,6 @@ jobs:
7569
build_config: Release
7670
target_framework: ${{ matrix.net }}
7771
specific_sha: ${{ inputs.specific_sha }}
78-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
7972
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
8073
test_output_verbosity: minimal
8174
test_run_timeout: 30
@@ -96,7 +89,6 @@ jobs:
9689
build_config: Release
9790
target_framework: ${{ matrix.net }}
9891
specific_sha: ${{ inputs.specific_sha }}
99-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
10092
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
10193
test_output_verbosity: minimal
10294
test_run_timeout: 30
@@ -117,7 +109,6 @@ jobs:
117109
build_config: Release
118110
target_framework: ${{ matrix.net }}
119111
specific_sha: ${{ inputs.specific_sha }}
120-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
121112
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
122113
test_output_verbosity: minimal
123114
test_run_timeout: 30

‎.github/workflows/dispatched-sqlite-tests.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ run-name: Run database tests on SQLite on dispatch. Run No ${{ github.run_number
33
on:
44
workflow_dispatch:
55
inputs:
6-
fetch_depth:
7-
description: 'Depth of repo fetch (change if SHA populated)'
8-
required: false
9-
default: 1
10-
type: number
116
specific_sha:
127
description: 'Commit SHA to checkout'
138
required: false
@@ -47,7 +42,6 @@ jobs:
4742
build_config: Release
4843
target_framework: ${{ matrix.net }}
4944
specific_sha: ${{ inputs.specific_sha }}
50-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
5145
show_all_fails: ${{ fromJSON(inputs.show_all_fails) }}
5246
test_output_verbosity: minimal
5347
test_run_timeout: 30

0 commit comments

Comments
 (0)