Skip to content

Commit 26da433

Browse files
committed
fix(ci): write windows_matrix to GITHUB_OUTPUT without invalid format
1 parent 75832c9 commit 26da433

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

.github/workflows/client-cpp-package.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,17 @@ jobs:
122122
echo "run_macos=${run_macos}" >> "$GITHUB_OUTPUT"
123123
echo "run_windows=${run_windows}" >> "$GITHUB_OUTPUT"
124124
125-
WINDOWS_MATRIX='[
126-
{"name":"windows-vs2026","runs-on":"windows-2025-vs2026","boost_choco":"boost-msvc-14.3","cmake_generator":"Visual Studio 18 2026","package_classifier":"windows-x86_64-vs2026","vs_choco":"","vs_choco_params":"","continue_on_error":false},
127-
{"name":"windows-vs2022","runs-on":"windows-2022","boost_choco":"boost-msvc-14.3","cmake_generator":"","package_classifier":"windows-x86_64-vs2022","vs_choco":"","vs_choco_params":"","continue_on_error":false},
128-
{"name":"windows-vs2019","runs-on":"windows-2022","boost_choco":"boost-msvc-14.2","cmake_generator":"Visual Studio 16 2019","package_classifier":"windows-x86_64-vs2019","vs_choco":"visualstudio2019buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended","continue_on_error":false},
129-
{"name":"windows-vs2017","runs-on":"windows-2022","boost_choco":"boost-msvc-14.1","cmake_generator":"Visual Studio 15 2017","package_classifier":"windows-x86_64-vs2017","vs_choco":"visualstudio2017buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended","continue_on_error":false},
130-
{"name":"windows-vs2015","runs-on":"windows-2022","boost_choco":"boost-msvc-14.0","cmake_generator":"Visual Studio 14 2015","package_classifier":"windows-x86_64-vs2015","vs_choco":"visualstudio2015buildtools","vs_choco_params":"","continue_on_error":true}
131-
]'
125+
# Compact JSON (no leading whitespace); required for GITHUB_OUTPUT + fromJSON().
126+
WINDOWS_MATRIX='[{"name":"windows-vs2026","runs-on":"windows-2025-vs2026","boost_choco":"boost-msvc-14.3","cmake_generator":"Visual Studio 18 2026","package_classifier":"windows-x86_64-vs2026","vs_choco":"","vs_choco_params":"","continue_on_error":false},{"name":"windows-vs2022","runs-on":"windows-2022","boost_choco":"boost-msvc-14.3","cmake_generator":"","package_classifier":"windows-x86_64-vs2022","vs_choco":"","vs_choco_params":"","continue_on_error":false},{"name":"windows-vs2019","runs-on":"windows-2022","boost_choco":"boost-msvc-14.2","cmake_generator":"Visual Studio 16 2019","package_classifier":"windows-x86_64-vs2019","vs_choco":"visualstudio2019buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended","continue_on_error":false},{"name":"windows-vs2017","runs-on":"windows-2022","boost_choco":"boost-msvc-14.1","cmake_generator":"Visual Studio 15 2017","package_classifier":"windows-x86_64-vs2017","vs_choco":"visualstudio2017buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended","continue_on_error":false},{"name":"windows-vs2015","runs-on":"windows-2022","boost_choco":"boost-msvc-14.0","cmake_generator":"Visual Studio 14 2015","package_classifier":"windows-x86_64-vs2015","vs_choco":"visualstudio2015buildtools","vs_choco_params":"","continue_on_error":true}]'
127+
128+
write_windows_matrix_output() {
129+
local matrix_json="$1"
130+
{
131+
echo 'windows_matrix<<__MATRIX_EOF__'
132+
echo "${matrix_json}"
133+
echo '__MATRIX_EOF__'
134+
} >> "$GITHUB_OUTPUT"
135+
}
132136
133137
if [[ "$run_windows" == true ]]; then
134138
if [[ "$VARIANT" == all || "$VARIANT" == windows ]]; then
@@ -142,9 +146,10 @@ jobs:
142146
echo "No Windows matrix rows for variant=${VARIANT}" >&2
143147
exit 1
144148
fi
145-
echo "windows_matrix=${FILTERED}" >> "$GITHUB_OUTPUT"
149+
FILTERED=$(echo "$FILTERED" | jq -c '.')
150+
write_windows_matrix_output "${FILTERED}"
146151
else
147-
echo "windows_matrix=[]" >> "$GITHUB_OUTPUT"
152+
write_windows_matrix_output '[]'
148153
fi
149154
150155
package-linux-glibc217:

0 commit comments

Comments
 (0)