Skip to content

Commit c8ddcfd

Browse files
committed
Merge branch '6.0' into 7.0
2 parents 4d54588 + a72fb0e commit c8ddcfd

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@7.0
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
@@ -171,8 +171,10 @@ jobs:
171171

172172
- name: Make Final Test report
173173
if: |
174-
(github.event_name == 'workflow_dispatch' && (steps.reprocessing.outcome != 'cancelled' || steps.complex_tests.outcome != 'cancelled'))
175-
|| (github.event_name != 'workflow_dispatch' && (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure'))
174+
(github.event_name == 'push' && (steps.reprocessing.outcome != 'cancelled' || steps.complex_tests.outcome != 'cancelled'))
175+
|| (github.event_name == 'pull_request' && (steps.reprocessing.outcome != 'cancelled' || steps.complex_tests.outcome != 'cancelled'))
176+
|| (github.event_name == 'workflow_dispatch' && (steps.reprocessing.outcome != 'cancelled' || steps.complex_tests.outcome != 'cancelled'))
177+
|| (steps.reprocessing.outcome == 'failure' || steps.complex_tests.outcome == 'failure')
176178
timeout-minutes: 1
177179
uses: dorny/test-reporter@v2.1.1
178180
with:

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

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

123123
- name: Make Final Test report
124124
if: |
125-
(github.event_name == 'workflow_dispatch' && steps.complex_tests.outcome != 'cancelled')
126-
|| (github.event_name != 'workflow_dispatch' && steps.complex_tests.outcome == 'failure')
125+
(github.event_name == 'push' && steps.complex_tests.outcome != 'cancelled')
126+
|| (github.event_name == 'pull_request' && steps.complex_tests.outcome != 'cancelled')
127+
|| (github.event_name == 'workflow_dispatch' && steps.complex_tests.outcome != 'cancelled')
128+
|| steps.complex_tests.outcome == 'failure'
127129
timeout-minutes: 1
128130
uses: dorny/test-reporter@v2.1.1
129131
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)