Skip to content

Commit a6c2634

Browse files
committed
Merge branch 'ci/fixes'
2 parents 5448dec + 1bef575 commit a6c2634

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/workflows/tests_hw_wokwi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
hw_types=$(jq -c '.hw_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
130130
wokwi_targets=$(jq -c '.wokwi_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
131131
wokwi_types=$(jq -c '.wokwi_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
132-
qemu_tests_enabled=$(jq -r '.qemu_tests_enabled' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:]")
132+
qemu_tests_enabled=$(jq -r '.qemu_enabled' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:]")
133133
qemu_targets=$(jq -c '.qemu_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
134134
qemu_types=$(jq -c '.qemu_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
135135

.github/workflows/tests_results.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,16 @@ jobs:
251251
WOKWI_RUN_ID: ${{ github.event.workflow_run.id }}
252252
BUILD_RUN_ID: ${{ needs.get-artifacts.outputs.original_run_id }}
253253
REPORT_FILE: ./runtime-test-results/RUNTIME_TEST_RESULTS.md
254-
IS_FAILING: |
255-
needs.get-artifacts.outputs.original_conclusion == 'failure' ||
256-
needs.get-artifacts.outputs.original_conclusion == 'cancelled' ||
257-
needs.get-artifacts.outputs.original_conclusion == 'timed_out' ||
258-
github.event.workflow_run.conclusion == 'failure' ||
259-
github.event.workflow_run.conclusion == 'cancelled' ||
260-
github.event.workflow_run.conclusion == 'timed_out' ||
261-
job.status == 'failure'
254+
IS_FAILING: >-
255+
${{
256+
needs.get-artifacts.outputs.original_conclusion == 'failure' ||
257+
needs.get-artifacts.outputs.original_conclusion == 'cancelled' ||
258+
needs.get-artifacts.outputs.original_conclusion == 'timed_out' ||
259+
github.event.workflow_run.conclusion == 'failure' ||
260+
github.event.workflow_run.conclusion == 'cancelled' ||
261+
github.event.workflow_run.conclusion == 'timed_out' ||
262+
job.status == 'failure'
263+
}}
262264
run: |
263265
rm -rf artifacts $REPORT_FILE
264266
mv -f ./unity_results.json ./runtime-test-results/unity_results.json

.gitlab/scripts/install_dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ apt-get update -y
1010
echo "[deps] Installing base packages"
1111
apt-get install -y jq unzip curl wget
1212

13-
echo "[deps] Installing Python packages (PyYAML)"
14-
pip3 install --no-cache-dir PyYAML
13+
echo "[deps] Installing Python packages"
14+
pip3 install PyYAML
1515

1616
echo "[deps] Installing yq (mikefarah/yq) for current architecture"
1717
YQ_VERSION="v4.48.1"

0 commit comments

Comments
 (0)