From 3011b6c568a78adf99a45fed506ae01b958c0755 Mon Sep 17 00:00:00 2001 From: Apprentice-Alchemist <53486764+Apprentice-Alchemist@users.noreply.github.com> Date: Wed, 2 Jul 2025 19:08:18 +0200 Subject: [PATCH 1/3] [ci] use Windows 2022 --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8ba0220..7e211b47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -145,7 +145,7 @@ jobs: strategy: matrix: arch: [Win32, x64] - vstools: [vs2017, vs2019] + vstools: [vs2017, vs2022] include: - arch: x64 name_suffix: 64 @@ -158,13 +158,13 @@ jobs: arch: x64 cmake_generator: Visual Studio 15 2017 Win64 - - vstools: vs2019 - cmake_generator: Visual Studio 16 2019 + - vstools: vs2022 + cmake_generator: Visual Studio 17 2022 env: CMAKE_BUILD_TYPE: RelWithDebInfo - runs-on: windows-2019 + runs-on: windows-2022 steps: - name: Checkout uses: actions/checkout@v4 @@ -178,7 +178,7 @@ jobs: run: | cmake . -G "${{ matrix.cmake_generator }}" ${{ env.CMAKE_ARCH_FLAG }} env: - CMAKE_ARCH_FLAG: ${{ matrix.vstools == 'vs2019' && format('-A {0}', matrix.arch) || ' ' }} + CMAKE_ARCH_FLAG: ${{ matrix.vstools == 'vs2022' && format('-A {0}', matrix.arch) || ' ' }} - name: Download dependencies run: | From ac01f4ba37d3c0e306b8d155b7ba3402e1fae6f8 Mon Sep 17 00:00:00 2001 From: Apprentice-Alchemist <53486764+Apprentice-Alchemist@users.noreply.github.com> Date: Wed, 2 Jul 2025 19:09:27 +0200 Subject: [PATCH 2/3] [ci] use Ubuntu 22.04 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e211b47..e17939d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - link_type: dynamic STATIC_DEPS: none - arch: amd64 - runner: ubuntu-20.04 + runner: ubuntu-22.04 - arch: arm64 runner: ubuntu-22.04-arm runs-on: ${{ matrix.runner }} From c51f3316fe80e2e3c79ecd06949907591bb5aa9e Mon Sep 17 00:00:00 2001 From: Apprentice-Alchemist <53486764+Apprentice-Alchemist@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:35:25 +0200 Subject: [PATCH 3/3] [cmake] update libatomic_ops download url --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f405a4e..91d98d86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,7 +265,7 @@ add_executable(nekovm if (STATIC_BOEHMGC OR WIN32) ExternalProject_Add(libatomic_ops ${EP_CONFIGS} - URL https://github.com/ivmai/libatomic_ops/releases/download/v7.6.14/libatomic_ops-7.6.14.tar.gz + URL https://github.com/bdwgc/libatomic_ops/releases/download/v7.6.14/libatomic_ops-7.6.14.tar.gz URL_MD5 ee8251f5091b7938d18be4dda843a515 CONFIGURE_COMMAND echo skip config BUILD_COMMAND echo skip build