From 88ea6810bc362ac55a145027ebb0a5d55b333925 Mon Sep 17 00:00:00 2001 From: Piyush-t24 Date: Mon, 9 Mar 2026 17:59:40 +0530 Subject: [PATCH] Fix duplicate .well-known handling and add Windows CI support --- .github/workflows/ci.yml | 12 +++++++++--- build.scala | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e6ccd3f..84f81d65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,10 @@ on: jobs: build: name: Build and Test - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v6 - uses: actions/setup-java@v5 @@ -20,9 +23,12 @@ jobs: - uses: VirtusLab/scala-cli-setup@main with: scala-cli-version: 1.12.2 - - run: scala-cli fmt --check . + - if: matrix.os == 'ubuntu-latest' + run: scala-cli fmt --check . - run: scala-cli --server=false build.scala - - if: github.event_name != 'pull_request' + env: + JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8 + - if: matrix.os == 'ubuntu-latest' && github.event_name != 'pull_request' uses: peaceiris/actions-gh-pages@v4.0.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.scala b/build.scala index 6287a514..f5c3210e 100644 --- a/build.scala +++ b/build.scala @@ -86,8 +86,9 @@ object LaikaBuild { ).toURL() InputTree[IO] + // Exclude `.well-known` from the main `src` scan to avoid duplicates; it is added explicitly below for consistent cross-platform behavior. + .withFileFilter(FileFilter.lift(_.name == ".well-known")) .addDirectory("src") - // Laika skips .dotfiles by default .addDirectory("src/.well-known", Path.Root / ".well-known") .addInputStream( IO.blocking(securityPolicy.openStream()),