eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

fix cpm-fetch again
Some checks failed
eden-license / license-header (pull_request) Failing after 17s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-09-21 01:35:40 -04:00
parent c128f628d8
commit e3cd3e0105
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/cpm-fetch-all.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
# SPDX-FileCopyrightText: 2025 Eden Emulator Project
# SPDX-License-Identifier: GPL-3.0-or-later
@ -6,6 +6,6 @@
# SPDX-FileCopyrightText: 2025 crueter
# SPDX-License-Identifier: GPL-3.0-or-later
LIBS=$(find . externals src/qt_common src/dynarmic -maxdepth 2 -name cpmfile.json -exec jq -j 'keys_unsorted | join(" ")' {} \; -printf " ")
LIBS=$(find . src -maxdepth 3 -name cpmfile.json -exec jq -j 'keys_unsorted | join(" ")' {} \; -printf " ")
tools/cpm-fetch.sh $LIBS

11
tools/cpm-fetch.sh
View file

@ -78,10 +78,7 @@ ci_package() {
PACKAGE=$(jq -r ".package | \"$package\"" <<< "$JSON")
# TODO(crueter)
DISABLED=$(jq -j '.disabled_platforms | join(" ")' <<< "$JSON")
echo $DISABLED
DISABLED=$(jq -j '.disabled_platforms' <<< "$JSON")
[ "$REPO" = null ] && echo "No repo defined for CI package $package" && return
@ -103,6 +100,10 @@ ci_package() {
PACKAGE_NAME="$PACKAGE"
KEY=$platform
LOWER_PACKAGE=$(tr '[:upper:]' '[:lower:]' <<< "$PACKAGE_NAME")
OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
[ -d "$OUTDIR" ] && continue
HASH_ALGO=$(jq -r ".hash_algo" <<< "$JSON")
[ "$HASH_ALGO" = null ] && HASH_ALGO=sha512
@ -119,7 +120,7 @@ for package in $@
do
# prepare for cancer
# TODO(crueter): Fetch json once?
JSON=$(find . externals src/qt_common src/dynarmic -maxdepth 2 -name cpmfile.json -exec jq -r ".\"$package\" | select( . != null )" {} \;)
JSON=$(find . src -maxdepth 3 -name cpmfile.json -exec jq -r ".\"$package\" | select( . != null )" {} \;)
[ -z "$JSON" ] && echo "!! No cpmfile definition for $package" && continue