[xb] Skip aarch64 submodule for x64 target
This commit is contained in:
2
.github/workflows/Linux_x86.yml
vendored
2
.github/workflows/Linux_x86.yml
vendored
@@ -85,7 +85,7 @@ jobs:
|
||||
|
||||
- name: Download 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
|
||||
|
||||
- name: Build Xenia
|
||||
|
||||
4
.github/workflows/Windows_x86.yml
vendored
4
.github/workflows/Windows_x86.yml
vendored
@@ -59,7 +59,9 @@ jobs:
|
||||
}
|
||||
|
||||
- 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
|
||||
run: python xenia-build.py build --config=Release --target=xenia-app
|
||||
|
||||
@@ -599,19 +599,21 @@ def git_submodule_update():
|
||||
if sys.platform == "linux":
|
||||
submodules_ignore = ["DirectX-Headers", "DirectXShaderCompiler"]
|
||||
else:
|
||||
submodules_ignore = None
|
||||
submodules_ignore = []
|
||||
if is_amd64():
|
||||
submodules_ignore.append("xbyak_aarch64")
|
||||
if submodules_ignore:
|
||||
with open(".gitmodules") as f:
|
||||
gitmodules = f.read()
|
||||
submodules = re_findall(r"(?<=path = )(?!third_party\/(?:" + "|".join(submodules_ignore) + r")).+", gitmodules)
|
||||
else:
|
||||
submodules = None
|
||||
submodules = []
|
||||
# Sync submodule URLs from .gitmodules to local config
|
||||
shell_call([
|
||||
"git",
|
||||
"submodule",
|
||||
"sync",
|
||||
*(submodules or []),
|
||||
*submodules,
|
||||
])
|
||||
# Then update all submodules to their recorded commits
|
||||
shell_call([
|
||||
@@ -623,7 +625,7 @@ def git_submodule_update():
|
||||
"--init",
|
||||
"--depth=1",
|
||||
"-j", f"{os.cpu_count()}",
|
||||
*(submodules or []),
|
||||
*submodules,
|
||||
])
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user