From 9b103673f322e923c4bd1341933d7da60c89bb3e Mon Sep 17 00:00:00 2001 From: Peter Dillinger Date: Fri, 15 Dec 2023 14:46:45 -0800 Subject: [PATCH] Migrate and temporary test nightly --- .github/workflows/jobs-windows.yml | 19 +------------------ .github/workflows/nightly.yml | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/.github/workflows/jobs-windows.yml b/.github/workflows/jobs-windows.yml index d71150d238a..cbe9d98a176 100644 --- a/.github/workflows/jobs-windows.yml +++ b/.github/workflows/jobs-windows.yml @@ -10,23 +10,7 @@ env: SNAPPY_INCLUDE: ${{ github.workspace }}/thirdparty/snappy-1.1.8;${{ github.workspace }}/thirdparty/snappy-1.1.8/build SNAPPY_LIB_DEBUG: ${{ github.workspace }}/thirdparty/snappy-1.1.8/build/Debug/snappy.lib jobs: -# TODO: move some to nightly as in a140b51 - build-windows-vs2022-avx2: - runs-on: windows-2022 - env: - CMAKE_GENERATOR: Visual Studio 17 2022 - CMAKE_PORTABLE: AVX2 - steps: - - uses: actions/checkout@v4.1.0 - - uses: "./.github/actions/windows-build-steps" - build-windows-vs2022: - runs-on: windows-2022 - env: - CMAKE_GENERATOR: Visual Studio 17 2022 - CMAKE_PORTABLE: 1 - steps: - - uses: actions/checkout@v4.1.0 - - uses: "./.github/actions/windows-build-steps" + # NOTE: some windows jobs are in "nightly" to save resources build-windows-vs2019: runs-on: windows-2019 env: @@ -35,4 +19,3 @@ jobs: steps: - uses: actions/checkout@v4.1.0 - uses: "./.github/actions/windows-build-steps" - diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d1b9f01fa84..49fa74f5d8b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,8 +1,5 @@ name: facebook/rocksdb/nightly -on: - schedule: - - cron: 0 9 * * * - workflow_dispatch: +on: [push, pull_request] # TEMPORARY: test on PR jobs: build-format-compatible: runs-on: @@ -81,3 +78,19 @@ jobs: - uses: "./.github/actions/pre-steps" - run: PORTABLE=1 make V=1 -j32 valgrind_test - uses: "./.github/actions/post-steps" + build-windows-vs2022-avx2: + runs-on: windows-2022 + env: + CMAKE_GENERATOR: Visual Studio 17 2022 + CMAKE_PORTABLE: AVX2 + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/windows-build-steps" + build-windows-vs2022: + runs-on: windows-2022 + env: + CMAKE_GENERATOR: Visual Studio 17 2022 + CMAKE_PORTABLE: 1 + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/windows-build-steps"