Skip to content

Commit af3943e

Browse files
committed
Merge branch 'ci/fixes'
2 parents 53f7e7c + 45a5626 commit af3943e

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

.github/workflows/tests_hw_wokwi.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ jobs:
150150
cat > artifacts/workflow_info.json <<EOF
151151
{
152152
"hw_tests_enabled": "$hw_tests_enabled",
153-
"hw_targets": "$hw_targets",
154-
"hw_types": "$hw_types",
153+
"hw_targets": $hw_targets,
154+
"hw_types": $hw_types,
155155
"wokwi_tests_enabled": "$wokwi_tests_enabled",
156-
"wokwi_targets": "$wokwi_targets",
157-
"wokwi_types": "$wokwi_types",
156+
"wokwi_targets": $wokwi_targets,
157+
"wokwi_types": $wokwi_types,
158158
"qemu_tests_enabled": "$qemu_tests_enabled",
159-
"qemu_targets": "$qemu_targets",
160-
"qemu_types": "$qemu_types",
159+
"qemu_targets": $qemu_targets,
160+
"qemu_types": $qemu_types,
161161
"ref": "$ref",
162162
"event": "${{ github.event.workflow_run.event }}",
163163
"sha": "${{ github.event.workflow_run.head_sha || github.sha }}",
@@ -345,7 +345,7 @@ jobs:
345345
download_artifacts: 'true'
346346
download_artifacts_on_failure: 'true'
347347
download_path: './gitlab-artifacts'
348-
variables: '{"TEST_TYPES":"${{ needs.get-artifacts.outputs.hw_types }}","TEST_CHIPS":"${{ needs.get-artifacts.outputs.hw_targets }}","PIPELINE_ID":"${{ env.id }}","BINARIES_RUN_ID":"${{ github.event.workflow_run.id }}","GITHUB_REPOSITORY":"${{ github.repository }}"}'
348+
variables: '{"TEST_TYPES":${{ needs.get-artifacts.outputs.hw_types }},"TEST_CHIPS":${{ needs.get-artifacts.outputs.hw_targets }},"PIPELINE_ID":"${{ env.id }}","BINARIES_RUN_ID":"${{ github.event.workflow_run.id }}","GITHUB_REPOSITORY":"${{ github.repository }}"}'
349349

350350
- name: Process Downloaded Artifacts
351351
if: ${{ always() && steps.check-tests.outputs.enabled == 'true' }}

.github/workflows/tests_results.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ jobs:
4040
- name: Get original info
4141
id: get-info
4242
run: |
43-
echo "Artifacts:"
44-
ls -laR ./artifacts
45-
4643
original_event=$(jq -r '.event' ./artifacts/parent-artifacts/workflow_info.json)
4744
original_action=$(jq -r '.action' ./artifacts/parent-artifacts/workflow_info.json)
4845
original_sha=$(jq -r '.sha' ./artifacts/parent-artifacts/workflow_info.json)
@@ -60,6 +57,16 @@ jobs:
6057
qemu_targets=$(jq -r '.qemu_targets' ./artifacts/parent-artifacts/workflow_info.json)
6158
qemu_types=$(jq -r '.qemu_types' ./artifacts/parent-artifacts/workflow_info.json)
6259
60+
hw_tests_enabled=$(jq -r '.hw_tests_enabled' ./artifacts/parent-artifacts/workflow_info.json)
61+
hw_targets=$(jq -r '.hw_targets' ./artifacts/parent-artifacts/workflow_info.json)
62+
hw_types=$(jq -r '.hw_types' ./artifacts/parent-artifacts/workflow_info.json)
63+
wokwi_tests_enabled=$(jq -r '.wokwi_tests_enabled' ./artifacts/parent-artifacts/workflow_info.json)
64+
wokwi_targets=$(jq -r '.wokwi_targets' ./artifacts/parent-artifacts/workflow_info.json)
65+
wokwi_types=$(jq -r '.wokwi_types' ./artifacts/parent-artifacts/workflow_info.json)
66+
qemu_tests_enabled=$(jq -r '.qemu_tests_enabled' ./artifacts/parent-artifacts/workflow_info.json)
67+
qemu_targets=$(jq -r '.qemu_targets' ./artifacts/parent-artifacts/workflow_info.json)
68+
qemu_types=$(jq -r '.qemu_types' ./artifacts/parent-artifacts/workflow_info.json)
69+
6370
# Sanitize the values to avoid security issues
6471
6572
# Event: Allow alphabetical characters and underscores

0 commit comments

Comments
 (0)