mirror of
https://github.com/godotengine/godot-nir-static.git
synced 2025-12-31 13:48:20 +03:00
Merge pull request #24 from bruvzg/ci_upd
Update CI images to windows-2022
This commit is contained in:
16
.github/workflows/ci.yaml
vendored
16
.github/workflows/ci.yaml
vendored
@@ -14,7 +14,7 @@ jobs:
|
||||
# MinGW/LLVM libs using UCRT
|
||||
- name: 🏁 Windows - MinGW/LLVM (UCRT) x86_64
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-x86_64-llvm-release
|
||||
artifact-path: bin/libNIR.windows.x86_64.a
|
||||
flags: use_mingw=yes arch=x86_64 use_llvm=yes mingw_prefix=$HOME/llvm-mingw
|
||||
@@ -22,7 +22,7 @@ jobs:
|
||||
|
||||
- name: 🏁 Windows - MinGW/LLVM (UCRT) x86_32
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-x86_32-llvm-release
|
||||
artifact-path: bin/libNIR.windows.x86_32.a
|
||||
flags: use_mingw=yes arch=x86_32 use_llvm=yes mingw_prefix=$HOME/llvm-mingw
|
||||
@@ -30,7 +30,7 @@ jobs:
|
||||
|
||||
- name: 🏁 Windows - MinGW/LLVM (UCRT) arm64
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-arm64-llvm-release
|
||||
artifact-path: bin/libNIR.windows.arm64.a
|
||||
flags: use_mingw=yes arch=arm64 use_llvm=yes mingw_prefix=$HOME/llvm-mingw
|
||||
@@ -39,21 +39,21 @@ jobs:
|
||||
# MSVC libs
|
||||
- name: 🏁 Windows - MSVC x86_64
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-x86_64-msvc-release
|
||||
artifact-path: bin/libNIR.windows.x86_64.lib
|
||||
flags: use_mingw=no arch=x86_64
|
||||
|
||||
- name: 🏁 Windows - MSVC x86_32
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-x86_32-msvc-release
|
||||
artifact-path: bin/libNIR.windows.x86_32.lib
|
||||
flags: use_mingw=no arch=x86_32
|
||||
|
||||
- name: 🏁 Windows - MSVC arm64
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-arm64-msvc-release
|
||||
artifact-path: bin/libNIR.windows.arm64.lib
|
||||
flags: use_mingw=no arch=arm64
|
||||
@@ -61,7 +61,7 @@ jobs:
|
||||
# MinGW/GCC libs using MSVCRT
|
||||
- name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-x86_64-gcc-release
|
||||
artifact-path: bin/libNIR.windows.x86_64.a
|
||||
flags: use_mingw=yes arch=x86_64
|
||||
@@ -71,7 +71,7 @@ jobs:
|
||||
|
||||
- name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_32
|
||||
platform: windows
|
||||
os: windows-2019
|
||||
os: windows-2022
|
||||
artifact-name: godot-nir-static-x86_32-gcc-release
|
||||
artifact-path: bin/libNIR.windows.x86_32.a
|
||||
flags: use_mingw=yes arch=x86_32
|
||||
|
||||
@@ -322,7 +322,6 @@ if env.get("is_msvc", False):
|
||||
else:
|
||||
env.Append(
|
||||
CPPDEFINES=[
|
||||
("__MSVCRT_VERSION__", 0x0700),
|
||||
"HAVE_STRUCT_TIMESPEC",
|
||||
]
|
||||
)
|
||||
@@ -331,6 +330,7 @@ else:
|
||||
|
||||
if env.get("use_llvm", False):
|
||||
extra_defines += [
|
||||
("__MSVCRT_VERSION__", 0x0700),
|
||||
"HAVE_TIMESPEC_GET",
|
||||
"_UCRT",
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user