diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8ba0220..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 }} @@ -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: | 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