Skip to content

Commit 5e5980f

Browse files
authored
Merge branch 'SanderMertens:master' into master
2 parents 997cc8c + bb07a08 commit 5e5980f

94 files changed

Lines changed: 4880 additions & 1533 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,59 @@ jobs:
865865
- name: test c++
866866
run: bake/bake run test\cpp -- -j 8
867867

868+
test-windows-msvc-x86:
869+
runs-on: windows-2022
870+
timeout-minutes: 45
871+
872+
steps:
873+
- uses: actions/checkout@v4
874+
- uses: ilammy/msvc-dev-cmd@v1
875+
with:
876+
arch: amd64_x86
877+
toolset: 14.44
878+
- name: verify MSVC target and version
879+
shell: pwsh
880+
run: |
881+
@'
882+
#if !defined(_M_IX86)
883+
#error Expected an x86 MSVC target
884+
#endif
885+
#if _MSC_VER > 1944
886+
#error Expected MSVC 19.44 or lower
887+
#endif
888+
int main(void) { return 0; }
889+
'@ | Set-Content -Encoding ascii verify_msvc_x86_1944_or_lower.c
890+
cl /nologo /Bv verify_msvc_x86_1944_or_lower.c
891+
.\verify_msvc_x86_1944_or_lower.exe
892+
- name: install bake
893+
run: |
894+
git clone https://github.com/SanderMertens/bake
895+
cd bake\build-Windows
896+
nmake
897+
cd ..
898+
./bake setup --local
899+
900+
- name: build flecs
901+
run: bake/bake
902+
903+
- name: test core
904+
run: bake/bake run test\core -- -j 8
905+
906+
- name: test addons
907+
run: bake/bake run test\addons -- -j 8
908+
909+
- name: test meta
910+
run: bake/bake run test\meta -- -j 8
911+
912+
- name: test script
913+
run: bake/bake run test\script -- -j 8
914+
915+
- name: test collections
916+
run: bake/bake run test\collections -- -j 8
917+
918+
- name: test c++
919+
run: bake/bake run test\cpp -- -j 8
920+
868921
test-msys:
869922
runs-on: windows-latest
870923
timeout-minutes: 30

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ bazel-*
1313
.vs
1414
out
1515
docs/html
16-
MODULE.bazel.lock
16+
MODULE.bazel.lock

0 commit comments

Comments
 (0)