From 0174206f1e3c9c6c63c0509550aefe0937094372 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Tue, 10 Dec 2024 11:21:07 +0100 Subject: [PATCH 1/4] Check if gh builds pass on Windows. --- .github/workflows/run-checks-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-checks-all.yml b/.github/workflows/run-checks-all.yml index 1bc0a0b564bb..3f8e4da19dfb 100644 --- a/.github/workflows/run-checks-all.yml +++ b/.github/workflows/run-checks-all.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-latest, windows-latest ] java: [ '21' ] runs-on: ${{ matrix.os }} @@ -51,7 +51,7 @@ jobs: # Operating systems to run on. # windows-latest: fairly slow to build and results in odd errors (see LUCENE-10167) # macos-latest: a tad slower than ubuntu and pretty much the same (?) so leaving out. - os: [ ubuntu-latest ] + os: [ ubuntu-latest, windows-latest ] java: [ '21' ] runs-on: ${{ matrix.os }} From 52d0d3b3ef1ae00f63806f85051e742c36bfa5fb Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Tue, 10 Dec 2024 11:29:45 +0100 Subject: [PATCH 2/4] Quote task times. --- .github/workflows/run-checks-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-checks-all.yml b/.github/workflows/run-checks-all.yml index 3f8e4da19dfb..38dcb08a32ba 100644 --- a/.github/workflows/run-checks-all.yml +++ b/.github/workflows/run-checks-all.yml @@ -38,7 +38,7 @@ jobs: - uses: ./.github/actions/prepare-for-build - name: Run gradle check (without tests) - run: ./gradlew check -x test -Ptask.times=true --max-workers 2 + run: ./gradlew check -x test "-Ptask.times=true" --max-workers 2 # This runs all tests without any other validation checks. From 44556cf1346e13c470ca21349bf953db5a3d3f32 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Tue, 10 Dec 2024 14:25:00 +0100 Subject: [PATCH 3/4] Turn off autocrlf for git. --- .github/workflows/run-checks-all.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run-checks-all.yml b/.github/workflows/run-checks-all.yml index 38dcb08a32ba..37a565027f5c 100644 --- a/.github/workflows/run-checks-all.yml +++ b/.github/workflows/run-checks-all.yml @@ -34,6 +34,9 @@ jobs: runs-on: ${{ matrix.os }} steps: + - name: Correct git autocrlf + run: git config --global core.autocrlf false + - uses: actions/checkout@v4 - uses: ./.github/actions/prepare-for-build @@ -57,6 +60,9 @@ jobs: runs-on: ${{ matrix.os }} steps: + - name: Correct git autocrlf + run: git config --global core.autocrlf false + - uses: actions/checkout@v4 - uses: ./.github/actions/prepare-for-build From 6a06b0d010d4c28a7adc2bdf2728ae5082784a57 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Tue, 10 Dec 2024 16:32:07 +0100 Subject: [PATCH 4/4] Include macos and windows, correct crlf on Windows only. --- .github/workflows/run-checks-all.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-checks-all.yml b/.github/workflows/run-checks-all.yml index 37a565027f5c..18dd308e9a77 100644 --- a/.github/workflows/run-checks-all.yml +++ b/.github/workflows/run-checks-all.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-latest ] java: [ '21' ] runs-on: ${{ matrix.os }} @@ -52,15 +52,14 @@ jobs: strategy: matrix: # Operating systems to run on. - # windows-latest: fairly slow to build and results in odd errors (see LUCENE-10167) - # macos-latest: a tad slower than ubuntu and pretty much the same (?) so leaving out. - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-latest, windows-latest, macos-latest ] java: [ '21' ] runs-on: ${{ matrix.os }} steps: - - name: Correct git autocrlf + - name: Correct git autocrlf on Windows + if: startsWith(matrix.os, 'windows') run: git config --global core.autocrlf false - uses: actions/checkout@v4