Skip to content

Commit

Permalink
Backport Access runtime setup changes on CI (#4470)
Browse files Browse the repository at this point in the history
* thanks, micro$oft (not really)

(cherry picked from commit 08a76f6)

# Conflicts:
#	Build/Azure/pipelines/templates/test-matrix.yml

* disable failing queries
  • Loading branch information
MaceWindu authored Apr 6, 2024
1 parent f0ca0fd commit dbcf0af
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Build/Azure/pipelines/templates/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
- name: Access_ACE_1
title: Access ACE (OLEDB/ODBC) x86
config_win: access.ace
script_win_global: access.ace.cmd
psscript_win_global: access.ace.ps1
enable_os_windows: true
enable_os_ubuntu: false
enable_os_macos: false
Expand All @@ -217,7 +217,7 @@ jobs:
- name: Access_ACE_2
title: Access ACE (OLEDB/ODBC) x86
config_win: access.ace
script_win_global: access.ace.cmd
psscript_win_global: access.ace.ps1
enable_os_windows: true
enable_os_ubuntu: false
enable_os_macos: false
Expand All @@ -236,7 +236,7 @@ jobs:
- name: Access_ACE_x64
title: Access ACE (ODBC-only) x64 # x64 OLEDB crashes randomly https://github.com/dotnet/runtime/issues/46187
config_win: access.ace.x64
script_win_global: access.ace.x64.cmd
psscript_win_global: access.ace.x64.ps1
enable_os_windows: true
enable_os_ubuntu: false
enable_os_macos: false
Expand Down
1 change: 0 additions & 1 deletion Build/Azure/scripts/access.ace.cmd

This file was deleted.

16 changes: 16 additions & 0 deletions Build/Azure/scripts/access.ace.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#choco install msaccess2010-redist-x86
Invoke-WebRequest -Uri https://raw.githubusercontent.com/linq2db/linq2db.ci/access/providers/access/AccessDatabaseEngine.exe -OutFile AccessDatabaseEngine.exe
$process = Start-Process -FilePath AccessDatabaseEngine.exe -ArgumentList ('/Passive', '/Quiet', '/NoRestart', '/Log:$($env:temp)\MSAccess210-redist.log') -Wait -PassThru
$exitCode = $process.ExitCode
if ($exitCode -eq 0)
{
Write-Host -Object 'Installation successful'
return $exitCode
}
else
{
Write-Host -Object "Non zero exit code returned by the installation process : $exitCode."
Get-Content '$($env:temp)\MSAccess210-redist.log'
exit $exitCode
}

1 change: 0 additions & 1 deletion Build/Azure/scripts/access.ace.x64.cmd

This file was deleted.

17 changes: 17 additions & 0 deletions Build/Azure/scripts/access.ace.x64.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#choco install msaccess2010-redist-x64 --allow-empty-checksums
Invoke-WebRequest -Uri https://raw.githubusercontent.com/linq2db/linq2db.ci/access/providers/access/AccessDatabaseEngine_X64.exe -OutFile AccessDatabaseEngine_X64.exe
$process = Start-Process -FilePath AccessDatabaseEngine_X64.exe -ArgumentList ('/Passive', '/Quiet', '/NoRestart', '/Log:$($env:temp)\MSAccess210-redist.log') -Wait -PassThru
$exitCode = $process.ExitCode
if ($exitCode -eq 0)
{
Write-Host -Object 'Installation successful'
return $exitCode
}
else
{
Write-Host -Object "Non zero exit code returned by the installation process : $exitCode."
Get-Content '$($env:temp)\MSAccess210-redist.log'
exit $exitCode
}


2 changes: 2 additions & 0 deletions Tests/Linq/Extensions/ClickHouseTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ from p in db.GetTable<ReplacingMergeTreeTable>()
Assert.That(LastQuery, Contains.Substring(ClickHouseHints.Table.Final));
}

[ActiveIssue("FINAL on subquery doesn't from since 24.3, not yet sure if it is regression or valid change")]
[Test]
public void FinalSubQueryHintTest([IncludeDataSources(true, TestProvName.AllClickHouse)] string context)
{
Expand Down Expand Up @@ -234,6 +235,7 @@ from p in g.DefaultIfEmpty()
Assert.That(LastQuery, Contains.Substring("ALL LEFT SEMI JOIN"));
}

[ActiveIssue("FINAL on subquery doesn't from since 24.3, not yet sure if it is regression or valid change")]
[Test]
public void ClickHouseUnionTest([IncludeDataSources(true, TestProvName.AllClickHouse)] string context)
{
Expand Down
2 changes: 1 addition & 1 deletion Tests/Linq/Linq/LoadWithTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ Tuple<MainItem[], MainItem2[], SubItem1[], SubItem1_Sub[], SubItem2[]> GenerateT
return Tuple.Create(mainItems, mainItems2, subItems1, subSubItems1, subItems2);
}


[ActiveIssue("https://github.com/ClickHouse/ClickHouse/issues/62358", Configuration = TestProvName.AllClickHouse)]
[Test]
public void LoadWithAndFilter([IncludeDataSources(TestProvName.AllSQLite, TestProvName.AllClickHouse)] string context)
{
Expand Down
4 changes: 2 additions & 2 deletions linq2db.sln
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net472", "net472", "{B7AADC
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{49A37E5A-A8A3-4C89-B11C-D700A9F52BAA}"
ProjectSection(SolutionItems) = preProject
Build\Azure\scripts\access.ace.cmd = Build\Azure\scripts\access.ace.cmd
Build\Azure\scripts\access.ace.x64.cmd = Build\Azure\scripts\access.ace.x64.cmd
Build\Azure\scripts\access.ace.ps1 = Build\Azure\scripts\access.ace.ps1
Build\Azure\scripts\clickhouse.sh = Build\Azure\scripts\clickhouse.sh
Build\Azure\scripts\access.ace.x64.ps1 = Build\Azure\scripts\access.ace.x64.ps1
Build\Azure\scripts\db2.provider.sh = Build\Azure\scripts\db2.provider.sh
Build\Azure\scripts\db2.sh = Build\Azure\scripts\db2.sh
Build\Azure\scripts\firebird25.sh = Build\Azure\scripts\firebird25.sh
Expand Down

0 comments on commit dbcf0af

Please sign in to comment.