Skip to content

Commit 728474f

Browse files
Merge branch '7.x'
2 parents 876cc3a + abe085c commit 728474f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ jobs:
7777
name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
7878

7979
steps:
80+
- name: Set git to use LF
81+
run: |
82+
git config --global core.autocrlf false
83+
git config --global core.eol lf
84+
8085
- name: Checkout code
8186
uses: actions/checkout@v2
8287

tests/Integration/Database/DatabaseMySqlTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected function setUp(): void
1616
{
1717
parent::setUp();
1818

19-
if (! isset($_SERVER['CI'])) {
19+
if (! isset($_SERVER['CI']) || windows_os()) {
2020
$this->markTestSkipped('This test is only executed on CI.');
2121
}
2222
}

0 commit comments

Comments
 (0)