godotengine/godot-nir-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-nir-static.git synced 2026-01-04 06:09:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from bruvzg/ci_upd

Browse Source 
Update CI images to windows-2022
This commit is contained in:
bruvzg
2025-10-31 21:48:25 +02:00
committed by GitHub
parent 226205dac0 f4466616e6
commit c95c0dc8b0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/ci.yaml vendored
View File

@@ -14,7 +14,7 @@ jobs:
# MinGW/LLVM libs using UCRT # MinGW/LLVM libs using UCRT
- name: 🏁 Windows - MinGW/LLVM (UCRT) x86_64 - name: 🏁 Windows - MinGW/LLVM (UCRT) x86_64
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-x86_64-llvm-release artifact-name: godot-nir-static-x86_64-llvm-release
artifact-path: bin/libNIR.windows.x86_64.a artifact-path: bin/libNIR.windows.x86_64.a
flags: use_mingw=yes arch=x86_64 use_llvm=yes mingw_prefix=$HOME/llvm-mingw 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 - name: 🏁 Windows - MinGW/LLVM (UCRT) x86_32
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-x86_32-llvm-release artifact-name: godot-nir-static-x86_32-llvm-release
artifact-path: bin/libNIR.windows.x86_32.a artifact-path: bin/libNIR.windows.x86_32.a
flags: use_mingw=yes arch=x86_32 use_llvm=yes mingw_prefix=$HOME/llvm-mingw 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 - name: 🏁 Windows - MinGW/LLVM (UCRT) arm64
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-arm64-llvm-release artifact-name: godot-nir-static-arm64-llvm-release
artifact-path: bin/libNIR.windows.arm64.a artifact-path: bin/libNIR.windows.arm64.a
flags: use_mingw=yes arch=arm64 use_llvm=yes mingw_prefix=$HOME/llvm-mingw flags: use_mingw=yes arch=arm64 use_llvm=yes mingw_prefix=$HOME/llvm-mingw
@@ -39,21 +39,21 @@ jobs:
# MSVC libs # MSVC libs
- name: 🏁 Windows - MSVC x86_64 - name: 🏁 Windows - MSVC x86_64
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-x86_64-msvc-release artifact-name: godot-nir-static-x86_64-msvc-release
artifact-path: bin/libNIR.windows.x86_64.lib artifact-path: bin/libNIR.windows.x86_64.lib
flags: use_mingw=no arch=x86_64 flags: use_mingw=no arch=x86_64
- name: 🏁 Windows - MSVC x86_32 - name: 🏁 Windows - MSVC x86_32
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-x86_32-msvc-release artifact-name: godot-nir-static-x86_32-msvc-release
artifact-path: bin/libNIR.windows.x86_32.lib artifact-path: bin/libNIR.windows.x86_32.lib
flags: use_mingw=no arch=x86_32 flags: use_mingw=no arch=x86_32
- name: 🏁 Windows - MSVC arm64 - name: 🏁 Windows - MSVC arm64
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-arm64-msvc-release artifact-name: godot-nir-static-arm64-msvc-release
artifact-path: bin/libNIR.windows.arm64.lib artifact-path: bin/libNIR.windows.arm64.lib
flags: use_mingw=no arch=arm64 flags: use_mingw=no arch=arm64
@@ -61,7 +61,7 @@ jobs:
# MinGW/GCC libs using MSVCRT # MinGW/GCC libs using MSVCRT
- name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64 - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-x86_64-gcc-release artifact-name: godot-nir-static-x86_64-gcc-release
artifact-path: bin/libNIR.windows.x86_64.a artifact-path: bin/libNIR.windows.x86_64.a
flags: use_mingw=yes arch=x86_64 flags: use_mingw=yes arch=x86_64
@@ -71,7 +71,7 @@ jobs:
- name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_32 - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_32
platform: windows platform: windows
os: windows-2019 os: windows-2022
artifact-name: godot-nir-static-x86_32-gcc-release artifact-name: godot-nir-static-x86_32-gcc-release
artifact-path: bin/libNIR.windows.x86_32.a artifact-path: bin/libNIR.windows.x86_32.a
flags: use_mingw=yes arch=x86_32 flags: use_mingw=yes arch=x86_32

2
SConstruct
View File

@@ -322,7 +322,6 @@ if env.get("is_msvc", False):
else: else:
env.Append( env.Append(
CPPDEFINES=[ CPPDEFINES=[
("__MSVCRT_VERSION__", 0x0700),
"HAVE_STRUCT_TIMESPEC", "HAVE_STRUCT_TIMESPEC",
] ]
) )
@@ -331,6 +330,7 @@ else:
if env.get("use_llvm", False): if env.get("use_llvm", False):
extra_defines += [ extra_defines += [
("__MSVCRT_VERSION__", 0x0700),
"HAVE_TIMESPEC_GET", "HAVE_TIMESPEC_GET",
"_UCRT", "_UCRT",
] ]