Skip to content

Commit 9f540fc

Browse files
Merge pull request #101 from LedgerHQ/cev/fix_check_all_icons
Fix icons check for all targets
2 parents a81cdfd + 4b2f040 commit 9f540fc

File tree

2 files changed

+32
-11
lines changed

2 files changed

+32
-11
lines changed

.github/workflows/end_to_end_tests_of_reusable_workflows.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ jobs:
7272
- name: ton
7373
repo: 'LedgerHQ/app-ton-new'
7474
branch: 'develop'
75+
- name: cardano
76+
repo: 'LedgerHQ/app-cardano'
77+
branch: 'develop'
7578

7679
uses: ./.github/workflows/reusable_build.yml
7780
with:

scripts/check_all.sh

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,18 @@ fi
106106

107107
# Check if MANIFEST is given in parameter
108108
if [[ -z ${MANIFEST} ]]; then
109-
if [[ -z ${TARGET} ]]; then
110-
MANIFEST_FILE="/tmp/manifests/manifest.json"
111-
else
112-
MANIFEST_FILE="/tmp/manifests/manifest_${TARGET}.json"
113-
fi
114-
MANIFEST_DIR=$(dirname "${MANIFEST_FILE}")
109+
MANIFEST_DIR="/tmp/manifests"
115110
# Remove the directory if it already exists
116111
[[ -d "${MANIFEST_DIR}" ]] && rm -rf "${MANIFEST_DIR}"
117112
mkdir -p "${MANIFEST_DIR}"
113+
[[ -n ${TARGET} ]] && MANIFEST_FILE="${MANIFEST_DIR}/manifest_${TARGET}.json"
118114
else
119115
if [[ -d "${MANIFEST}" ]]; then
120-
MANIFEST_FILE="${MANIFEST}/manifest.json"
116+
MANIFEST_DIR="${MANIFEST}"
121117
else
122118
MANIFEST_FILE="${MANIFEST}"
119+
MANIFEST_DIR=$(dirname "${MANIFEST_FILE}")
123120
fi
124-
MANIFEST_DIR=$(dirname "${MANIFEST_FILE}")
125121
fi
126122

127123
if [[ (-z ${REQUESTED_CHECK}) || ("${REQUESTED_CHECK}" == app_load_params) ]]; then
@@ -163,10 +159,32 @@ call_step() {
163159

164160
case ${step} in
165161
"manifest")
166-
if [[ "${IS_RUST}" == true ]]; then
167-
COMMAND="(cd ${APP_DIR} && python ${dirName}/cargo_metadata_dump.py --device ${TARGET} --app_build_path ${BUILD_DIR} --json_path ${MANIFEST_FILE})"
162+
if [[ -n ${MANIFEST_FILE} ]]; then
163+
eval BOLOS_SDK="$(echo "\$${TARGET}" | tr '[:lower:]' '[:upper:]')_SDK"
164+
if [[ "${IS_RUST}" == true ]]; then
165+
COMMAND="(cd ${APP_DIR} && python ${dirName}/cargo_metadata_dump.py --device ${TARGET} --app_build_path ${BUILD_DIR} --json_path ${MANIFEST_FILE})"
166+
else
167+
COMMAND="(cd ${APP_DIR} && python ${dirName}/makefile_dump.py --app_build_path ${BUILD_DIR} --json_path ${MANIFEST_FILE})"
168+
fi
168169
else
169-
COMMAND="(cd ${APP_DIR} && python ${dirName}/makefile_dump.py --app_build_path ${BUILD_DIR} --json_path ${MANIFEST_FILE})"
170+
log_step "Get ${step} (All targets)"
171+
ALL_TARGETS=$(ledger-manifest --output-devices ledger_app.toml | tail -n +2 | awk -F" " '{print $2}' | sed 's/+/p/' )
172+
for tgt in ${ALL_TARGETS}; do
173+
eval BOLOS_SDK="$(echo "\$${tgt}" | tr '[:lower:]' '[:upper:]')_SDK"
174+
if [[ "${IS_RUST}" == true ]]; then
175+
COMMAND="(cd ${APP_DIR} && python ${dirName}/cargo_metadata_dump.py --device ${tgt} --app_build_path ${BUILD_DIR} --json_path ${MANIFEST_DIR}/manifest_${tgt}.json)"
176+
else
177+
COMMAND="(cd ${APP_DIR} && python ${dirName}/makefile_dump.py --app_build_path ${BUILD_DIR} --json_path ${MANIFEST_DIR}/manifest_${tgt}.json)"
178+
fi
179+
[[ "${VERBOSE}" == true ]] && echo "Running: ${COMMAND}"
180+
eval "${COMMAND}"
181+
err=$?
182+
if [[ ${err} -ne 0 ]]; then
183+
log_error "Check ${step} failed"
184+
exit 1
185+
fi
186+
done
187+
return
170188
fi
171189
;;
172190
"icons")

0 commit comments

Comments
 (0)