Skip to content

Commit c5abbe9

Browse files
alex-kulakovalex-kulakov
committed
Merge branch '7.0' into 7.1
2 parents dc3c9ef + 3ea6524 commit c5abbe9

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
3030
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
3131
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
32-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
32+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
3333
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
3434
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
3535
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -62,7 +62,7 @@ on:
6262
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
6363
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
6464
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
65-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
65+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
6666
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
6767
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
6868
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -96,7 +96,7 @@ on:
9696
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
9797
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
9898
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
99-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
99+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
100100
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
101101
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
102102
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ on:
3535
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
3636
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
3737
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
38-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
38+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
3939
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
4040
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
4141
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -77,7 +77,7 @@ on:
7777
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
7878
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
7979
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
80-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
80+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
8181
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
8282
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
8383
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -119,7 +119,7 @@ on:
119119
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
120120
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
121121
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
122-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
122+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
123123
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
124124
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
125125
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'

‎.github/workflows/auto-mssql2022-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
3030
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
3131
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
32-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
32+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
3333
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
3434
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
3535
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -62,7 +62,7 @@ on:
6262
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
6363
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
6464
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
65-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
65+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
6666
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
6767
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
6868
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -96,7 +96,7 @@ on:
9696
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
9797
- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
9898
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
99-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
99+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
100100
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
101101
#- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
102102
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'

‎.github/workflows/auto-mysql82-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
3030
#- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
3131
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
32-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
32+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
3333
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
3434
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
3535
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -63,7 +63,7 @@ on:
6363
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
6464
#- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
6565
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
66-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
66+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
6767
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
6868
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
6969
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'
@@ -97,7 +97,7 @@ on:
9797
- '!Orm/Xtensive.Orm.Tests.Sql/Firebird/**'
9898
#- '!Orm/Xtensive.Orm.Tests.Sql/MySQL/**'
9999
- '!Orm/Xtensive.Orm.Tests.Sql/Oracle/**'
100-
- '!Orm/Xtensive.Orm.Tests.Sql/PosgreSql/**'
100+
- '!Orm/Xtensive.Orm.Tests.Sql/PostgreSql/**'
101101
- '!Orm/Xtensive.Orm.Tests.Sql/Sqlite/**'
102102
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServer/**'
103103
- '!Orm/Xtensive.Orm.Tests.Sql/SqlServerCe/**'

‎Orm/Xtensive.Orm.Tests/TestInfoTest.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public void IsGithubActionsTest()
2626
if (githubActions is null) {
2727
Assert.That(TestInfo.IsGithubActions, Is.False);
2828

29-
var githbuActionsNoIgnore = Environment.GetEnvironmentVariable("GA_NO_IGNORE");
30-
Console.WriteLine($"GA_NO_IGNORE : {githbuActionsNoIgnore} ; NoIgnoreOnGithubActions : {TestInfo.NoIgnoreOnGithubActions}");
31-
if (githbuActionsNoIgnore is null)
32-
Assert.That(TestInfo.NoIgnoreOnGithubActions);
29+
var githubActionsNoIgnore = Environment.GetEnvironmentVariable("GA_NO_IGNORE");
30+
Console.WriteLine($"GA_NO_IGNORE : {githubActionsNoIgnore} ; NoIgnoreOnGithubActions : {TestInfo.NoIgnoreOnGithubActions}");
31+
if (githubActionsNoIgnore is null)
32+
Assert.That(TestInfo.NoIgnoreOnGithubActions, Is.False);
3333
else
34-
Assert.That(TestInfo.NoIgnoreOnGithubActions);
34+
Assert.That(TestInfo.NoIgnoreOnGithubActions, Is.EqualTo(githubActionsNoIgnore.Equals("true", StringComparison.OrdinalIgnoreCase)));
3535
}
3636
else {
3737
Assert.That(TestInfo.IsGithubActions, Is.True);
@@ -45,13 +45,13 @@ public void IsGithubActionsTest()
4545
Assert.That(TestInfo.GithubActionTrigger.HasValue, Is.True);
4646
}
4747

48-
var githbuActionsNoIgnore = Environment.GetEnvironmentVariable("GA_NO_IGNORE");
49-
Console.WriteLine($"GA_NO_IGNORE : {githbuActionsNoIgnore} ; NoIgnoreOnGithubActions : {TestInfo.NoIgnoreOnGithubActions}");
50-
if (githbuActionsNoIgnore is null) {
48+
var githubActionsNoIgnore = Environment.GetEnvironmentVariable("GA_NO_IGNORE");
49+
Console.WriteLine($"GA_NO_IGNORE : {githubActionsNoIgnore} ; NoIgnoreOnGithubActions : {TestInfo.NoIgnoreOnGithubActions}");
50+
if (githubActionsNoIgnore is null) {
5151
Assert.That(TestInfo.NoIgnoreOnGithubActions, Is.False);
5252
}
5353
else {
54-
Assert.That(TestInfo.NoIgnoreOnGithubActions, Is.EqualTo(githbuActionsNoIgnore.Equals("true", StringComparison.OrdinalIgnoreCase)));
54+
Assert.That(TestInfo.NoIgnoreOnGithubActions, Is.EqualTo(githubActionsNoIgnore.Equals("true", StringComparison.OrdinalIgnoreCase)));
5555
}
5656
}
5757
}

0 commit comments

Comments
 (0)