Skip to content

Fix CI. #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobil4sk merged 3 commits into from
Jul 5, 2025
Merged

Fix CI. #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3011b6c
[ci] use Windows 2022
Apprentice-Alchemist Jul 2, 2025
ac01f4b
[ci] use Ubuntu 22.04
Apprentice-Alchemist Jul 2, 2025
c51f331
[cmake] update libatomic_ops download url
Apprentice-Alchemist Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
strategy:
matrix:
arch: [Win32, x64]
vstools: [vs2017, vs2019]
vstools: [vs2017, vs2022]
include:
- arch: x64
name_suffix: 64
Expand All @@ -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
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down