fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[xb] Skip aarch64 submodule for x64 target

Browse Source
This commit is contained in:
Margen67
2026-07-14 02:09:15 -07:00
parent 22d91c86e8
commit bad346717a
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/Linux_x86.yml vendored
View File

@@ -85,7 +85,7 @@ jobs:
- name: Download submodules - name: Download submodules
run: |- # Exclude unneeded submodules run: |- # Exclude unneeded submodules
SUBMODULES=$(grep -oP '(?<=path = )(?!third_party\/DirectX(?:-Headers|ShaderCompiler)).+' .gitmodules) SUBMODULES=$(grep -oP '(?<=path = )(?!third_party\/(?:DirectX(?:-Headers|ShaderCompiler)|xbyak_aarch64)).+' .gitmodules)
git submodule update --init --depth=1 -j$(getconf _NPROCESSORS_ONLN) $SUBMODULES git submodule update --init --depth=1 -j$(getconf _NPROCESSORS_ONLN) $SUBMODULES
- name: Build Xenia - name: Build Xenia

4
.github/workflows/Windows_x86.yml vendored
View File

@@ -59,7 +59,9 @@ jobs:
} }
- name: Download submodules - name: Download submodules
run: git submodule update --init --depth=1 -j $env:NUMBER_OF_PROCESSORS run: |- # Exclude unneeded submodules
$SUBMODULES=(Select-String -CaseSensitive '(?<=path = )(?!third_party\/xbyak_aarch64).+' .gitmodules).Matches.Value
git submodule update --init --depth=1 -j $env:NUMBER_OF_PROCESSORS $SUBMODULES
- name: Build Xenia - name: Build Xenia
run: python xenia-build.py build --config=Release --target=xenia-app run: python xenia-build.py build --config=Release --target=xenia-app

10
xenia-build.py
View File

@@ -599,19 +599,21 @@ def git_submodule_update():
if sys.platform == "linux": if sys.platform == "linux":
submodules_ignore = ["DirectX-Headers", "DirectXShaderCompiler"] submodules_ignore = ["DirectX-Headers", "DirectXShaderCompiler"]
else: else:
submodules_ignore = None submodules_ignore = []
if is_amd64():
submodules_ignore.append("xbyak_aarch64")
if submodules_ignore: if submodules_ignore:
with open(".gitmodules") as f: with open(".gitmodules") as f:
gitmodules = f.read() gitmodules = f.read()
submodules = re_findall(r"(?<=path = )(?!third_party\/(?:" + "|".join(submodules_ignore) + r")).+", gitmodules) submodules = re_findall(r"(?<=path = )(?!third_party\/(?:" + "|".join(submodules_ignore) + r")).+", gitmodules)
else: else:
submodules = None submodules = []
# Sync submodule URLs from .gitmodules to local config # Sync submodule URLs from .gitmodules to local config
shell_call([ shell_call([
"git", "git",
"submodule", "submodule",
"sync", "sync",
*(submodules or []), *submodules,
]) ])
# Then update all submodules to their recorded commits # Then update all submodules to their recorded commits
shell_call([ shell_call([
@@ -623,7 +625,7 @@ def git_submodule_update():
"--init", "--init",
"--depth=1", "--depth=1",
"-j", f"{os.cpu_count()}", "-j", f"{os.cpu_count()}",
*(submodules or []), *submodules,
]) ])