Skip to content

Commit 9428c09

Browse files
committed
Merge branch '7.1'
2 parents 07c8394 + dc3c9ef commit 9428c09

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,11 @@ jobs:
118118
119119
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-independant-tests.yml@master
120120
with:
121-
storage: sqlite3
122121
build_config: Release
123122
target_framework: ${{ matrix.net }}
124123
test_output_verbosity: minimal
125124
test_run_timeout: 10
126-
run_main: true
127-
run_sql: true
128-
run_extensions: true
125+
run_core: true
126+
run_log4net: true
127+
run_nlog: true
129128
publish_raw_results: false

.github/workflows/reusable-storage-dependant-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,10 @@ jobs:
172172

173173
- name: Make Final Test report
174174
if: |
175-
(github.event_name == 'workflow_dispatch' && (steps.reprocessing.outcome != 'cancelled' || steps.complex_tests.outcome != 'cancelled'))
176-
|| (github.event_name != 'workflow_dispatch' && (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure'))
175+
(github.event_name == 'push' && (steps.reprocessing.outcome != 'cancelled' && steps.complex_tests.outcome != 'cancelled'))
176+
|| (github.event_name == 'pull_request' && (steps.reprocessing.outcome != 'cancelled' && steps.complex_tests.outcome != 'cancelled'))
177+
|| (github.event_name == 'workflow_dispatch' && (steps.reprocessing.outcome != 'cancelled' && steps.complex_tests.outcome != 'cancelled'))
178+
|| (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure')
177179
timeout-minutes: 1
178180
uses: dorny/[email protected]
179181
with:

.github/workflows/reusable-storage-independant-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,10 @@ jobs:
123123

124124
- name: Make Final Test report
125125
if: |
126-
(github.event_name == 'workflow_dispatch' && steps.complex_tests.outcome != 'cancelled')
127-
|| (github.event_name != 'workflow_dispatch' && steps.complex_tests.outcome == 'failure')
126+
(github.event_name == 'push' && steps.complex_tests.outcome != 'cancelled')
127+
|| (github.event_name == 'pull_request' && steps.complex_tests.outcome != 'cancelled')
128+
|| (github.event_name == 'workflow_dispatch' && steps.complex_tests.outcome != 'cancelled')
129+
|| steps.complex_tests.outcome == 'failure'
128130
timeout-minutes: 1
129131
uses: dorny/[email protected]
130132
with:

Orm/Xtensive.Orm.Tests.Framework/TestInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ private static IEnumerable<T> GetMethodAttributes<T>() where T : Attribute
9595
private static GithubActionsEvents? TryParseGithubEventName(string varValue)
9696
{
9797
return varValue switch {
98+
"push" => GithubActionsEvents.Push,
9899
"pull_request" => GithubActionsEvents.PullRequest,
99100
"pull_request_comment" => GithubActionsEvents.PullRequest,
100101
"pull_request_review" => GithubActionsEvents.PullRequest,

Orm/Xtensive.Orm.Tests/Issues/Issue0839_MultithreadingBug.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ protected override DomainConfiguration BuildConfiguration()
5757
}
5858

5959
[Test]
60+
[IgnoreOnGithubActionsIfFailed(StorageProvider.Sqlite,
61+
"There is no detection of type exceptions in Sqlite driver yet. So any exception will cause this test fail")]
6062
public void MainTest()
6163
{
6264
using (var session = Domain.OpenSession()) {

0 commit comments

Comments
 (0)