From 1be79a2b7b60c0a1fa440cf46bbe0df31d11ac79 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Sun, 22 Jun 2025 12:33:05 +0200 Subject: [PATCH] CI: Move nightly Windows build to nightly-lagom Since lagom-template supports Windows builds now, we no longer need a separate nightly-windows workflow. --- .github/workflows/nightly-lagom.yml | 7 +++ .github/workflows/nightly-windows.yml | 83 --------------------------- 2 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 .github/workflows/nightly-windows.yml diff --git a/.github/workflows/nightly-lagom.yml b/.github/workflows/nightly-lagom.yml index f5e16ed48a1..5de7ef2377d 100644 --- a/.github/workflows/nightly-lagom.yml +++ b/.github/workflows/nightly-lagom.yml @@ -61,6 +61,13 @@ jobs: clang_plugins: false runner_labels: '["macos-15"]' + - os_name: 'Windows' + arch: 'x86_64' + build_preset: 'Windows_Sanitizer_CI' + toolchain: 'ClangCL' + clang_plugins: false + runner_labels: '["windows-2025"]' + uses: ./.github/workflows/lagom-template.yml with: toolchain: ${{ matrix.toolchain }} diff --git a/.github/workflows/nightly-windows.yml b/.github/workflows/nightly-windows.yml deleted file mode 100644 index be80af11df9..00000000000 --- a/.github/workflows/nightly-windows.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: Nightly Windows - -on: - # Automatically run at the end of every day. - schedule: - - cron: '0 0 * * *' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - # runner.workspace = /home/runner/work/ladybird - # github.workspace = /home/runner/work/ladybird/ladybird - LADYBIRD_SOURCE_DIR: ${{ github.workspace }} - VCPKG_ROOT: ${{ github.workspace }}/Build/vcpkg - -jobs: - CI: - if: github.repository == 'LadybirdBrowser/ladybird' - - runs-on: windows-2025 - - steps: - - uses: actions/checkout@v4 - if: ${{ github.event_name != 'pull_request' }} - - - name: Set Up Environment - uses: ./.github/actions/setup - with: - os: 'Windows' - arch: 'x86_64' - toolchain: 'ClangCL' - - - name: Restore Caches - uses: ./.github/actions/cache-restore - id: 'cache-restore' - with: - runner_labels: '["windows-2025"]' - os: Windows - arch: x86_64 - toolchain: ClangCL - cache_key_extra: Windows_Sanitizer_CI - download_cache_path: ${{ github.workspace }}/Build/caches - vcpkg_cache_path: ${{ github.workspace }}/Build/caches/vcpkg-binary-cache - - - name: Create Build Environment - working-directory: ${{ github.workspace }} - run: | - cmake --preset Windows_Sanitizer_CI - - - name: Build - working-directory: ${{ github.workspace }} - run: | - cmake --build --preset Windows_Sanitizer_CI - - - name: Save Caches - uses: ./.github/actions/cache-save - with: - runner_labels: '["windows-2025"]' - arch: x86_64 - vcpkg_cache_path: ${{ github.workspace }}/Build/caches/vcpkg-binary-cache - vcpkg_cache_primary_key: ${{ steps.cache-restore.outputs.vcpkg_cache_primary_key }} - - - name: Test - working-directory: ${{ github.workspace }} - run: ctest --preset Windows_Sanitizer_CI --timeout 1800 - env: - TESTS_ONLY: 1 - ASAN_OPTIONS: 'log_path="${{ github.workspace }}\asan.log"' - UBSAN_OPTIONS: 'log_path="${{ github.workspace }}\ubsan.log"' - - - name: Sanitizer Output - if: ${{ !cancelled() && inputs.build_preset == 'Windows_Sanitizer_CI' }} - working-directory: ${{ github.workspace }} - run: | - log_output=$(find . -maxdepth 1 \( -name 'asan.log.*' -o -name 'ubsan.log.*' \) -exec cat {} \; ) - if [ -z "$log_output" ]; then - echo "No sanitizer issues found." - else - echo "$log_output" - echo "Sanitizer errors happened while running tests; see the Test step above." - fi