From f8632c51f10a8ae63e972e1063d5ee2c7fbda6e6 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sat, 19 Oct 2024 12:35:39 +0200 Subject: ci: bump Intel macOS runners to 13 Problem: macos-12 GH runners are deprecated and will be removed soon. Solution: use macos-13 runners instead. --- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6abdd588ba..de90a077ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,9 +81,9 @@ jobs: strategy: fail-fast: false matrix: - runner: [ macos-12, macos-14 ] + runner: [ macos-13, macos-14 ] include: - - runner: macos-12 + - runner: macos-13 arch: x86_64 - runner: macos-14 arch: arm64 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 522692b30a..0885efddd5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,8 +107,8 @@ jobs: { runner: ubuntu-24.04, os: ubuntu, flavor: asan, cc: clang, flags: -D ENABLE_ASAN_UBSAN=ON }, { runner: ubuntu-24.04, os: ubuntu, flavor: tsan, cc: clang, flags: -D ENABLE_TSAN=ON }, { runner: ubuntu-24.04, os: ubuntu, cc: gcc }, - { runner: macos-12, os: macos, flavor: 12, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER }, - { runner: macos-15, os: macos, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER }, + { runner: macos-13, os: macos, flavor: intel, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER }, + { runner: macos-15, os: macos, flavor: arm, cc: clang, flags: -D CMAKE_FIND_FRAMEWORK=NEVER, deps_flags: -D CMAKE_FIND_FRAMEWORK=NEVER }, { runner: ubuntu-24.04, os: ubuntu, flavor: puc-lua, cc: gcc, deps_flags: -D USE_BUNDLED_LUAJIT=OFF -D USE_BUNDLED_LUA=ON, flags: -D PREFER_LUA=ON }, ] test: [unittest, functionaltest, oldtest] -- cgit From 0da4d89558a05fb86186253e778510cfd859caea Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sun, 3 Nov 2024 16:00:18 +0100 Subject: ci: work around flaky python tests (#31063) It's the same workaround as 88ed9ffcd1c022811ebc8818e153fe94e4741671, which was later removed in f707ce76acb86e064d549dc762f5636af072d3c5 after it turned out to be stable after a while. --- .github/workflows/test_windows.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index db7ad93f55..8829296756 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -31,6 +31,13 @@ jobs: cmake --preset ci -D CMAKE_BUILD_TYPE='RelWithDebInfo' ${{ inputs.build_flags }} cmake --build build + # FIXME(dundargoc): this workaround is needed as the python3 provider + # tests suddenly started to become extremely flaky, and this removes the + # flakiness for some reason. + - uses: actions/setup-python@v4 + with: + python-version: '3.13' + - name: Install test deps run: | $PSNativeCommandArgumentPassing = 'Legacy' -- cgit From 2024c10d74cea760ff9e4ac8208cc4c9c176f4d3 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 15 Nov 2024 08:47:22 +0100 Subject: ci(win): remove python workaround (#31212) Explicitly installing Python 3.13 using (deprecated version of) `setup-python` looks to be no longer required for provider tests to pass. --- .github/workflows/test_windows.yml | 7 ------- 1 file changed, 7 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index 8829296756..db7ad93f55 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -31,13 +31,6 @@ jobs: cmake --preset ci -D CMAKE_BUILD_TYPE='RelWithDebInfo' ${{ inputs.build_flags }} cmake --build build - # FIXME(dundargoc): this workaround is needed as the python3 provider - # tests suddenly started to become extremely flaky, and this removes the - # flakiness for some reason. - - uses: actions/setup-python@v4 - with: - python-version: '3.13' - - name: Install test deps run: | $PSNativeCommandArgumentPassing = 'Legacy' -- cgit