Skip to content

Commit 30593ea

Browse files
mulle-natCopilot
andcommitted
fix: move cross-compile vars from global to user-host scope in test subprojects
demo, test-startup, test-compiler-runtime, test-compiler had MULLE_CRAFT_PLATFORMS=windows in environment-global.sh causing CI to attempt cross-compilation which fails (no windows toolchain on github runners). Same fix as applied in release step for top-level repos. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 53cfd67 commit 30593ea

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

test-compiler-runtime/.mulle/etc/env/environment-global.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ export MULLE_FETCH_SEARCH_PATH="${MULLE_FETCH_SEARCH_PATH}:${MULLE_VIRTUAL_ROOT}
77
#
88
#
99
#
10-
export MULLE_CRAFT_PLATFORMS="${MULLE_UNAME}:windows"
10+
1111

1212

1313
#
1414
#
1515
#
16-
export MULLE_SOURCETREE_PLATFORMS="${MULLE_UNAME}:windows"
16+
1717

1818

1919
#
2020
#
2121
#
22-
export MULLE_CRAFT_TOOLCHAIN__WINDOWS="toolchain--linux-windows--x86_64-w64-mingw32--mulle-clang"
22+
2323

2424

2525
#
2626
#
2727
#
28-
export MULLE_EMULATOR__WINDOWS="WINEDEBUG=fixme-all,err-all wine"
28+
2929

3030

3131
#
3232
#
3333
#
34-
export MULLE_CRAFT_CROSS_COMPILER_ROOT__WINDOWS="/opt/mulle-clang-project-windows/latest"
34+
3535

3636

test-compiler/.mulle/etc/env/environment-global.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@ export MULLE_FETCH_SEARCH_PATH="${MULLE_FETCH_SEARCH_PATH}:${MULLE_VIRTUAL_ROOT}
77
#
88
#
99
#
10-
export MULLE_CRAFT_PLATFORMS="${MULLE_UNAME}:windows"
10+
1111

1212

1313
#
1414
#
1515
#
16-
export MULLE_SOURCETREE_PLATFORMS="${MULLE_UNAME}:windows"
16+
1717

1818

1919
#
2020
#
2121
#
22-
export MULLE_CRAFT_TOOLCHAIN__WINDOWS="toolchain--linux-windows--x86_64-w64-mingw32--mulle-clang"
22+
2323

2424

2525
#
2626
#
2727
#
28-
export MULLE_EMULATOR__WINDOWS="WINEDEBUG=fixme-all,err-all wine"
28+
2929

3030

3131
#
3232
#
3333
#
34-
export MULLE_CRAFT_CROSS_COMPILER_ROOT__WINDOWS="/opt/mulle-clang-project-windows/latest"
34+
3535

3636

3737
#

test-startup/.mulle/etc/env/environment-global.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ export MULLE_FETCH_SEARCH_PATH="${MULLE_FETCH_SEARCH_PATH}:${MULLE_VIRTUAL_ROOT}
77
#
88
#
99
#
10-
export MULLE_CRAFT_PLATFORMS="${MULLE_UNAME}:windows"
10+
1111

1212

1313
#
1414
#
1515
#
16-
export MULLE_SOURCETREE_PLATFORMS="${MULLE_UNAME}:windows"
16+
1717

1818

1919
#
2020
#
2121
#
22-
export MULLE_CRAFT_TOOLCHAIN__WINDOWS="toolchain--linux-windows--x86_64-w64-mingw32--mulle-clang"
22+
2323

2424

2525
#
2626
#
2727
#
28-
export MULLE_EMULATOR__WINDOWS="WINEDEBUG=fixme-all,err-all wine"
28+
2929

3030

3131
#
3232
#
3333
#
34-
export MULLE_CRAFT_CROSS_COMPILER_ROOT__WINDOWS="/opt/mulle-clang-project-windows/latest"
34+
3535

3636

0 commit comments

Comments
 (0)