diff --git a/etc/ci/describe-system-config-macos.sh b/etc/ci/describe-system-config-macos.sh index 8d5f1f9bf2..d78ad98714 100755 --- a/etc/ci/describe-system-config-macos.sh +++ b/etc/ci/describe-system-config-macos.sh @@ -35,3 +35,4 @@ group coqc --config group coqc --version group "true | coqtop" group etc/machine.sh +etc/ci/github-actions-record-coq-info.sh diff --git a/etc/ci/describe-system-config-win.bat b/etc/ci/describe-system-config-win.bat index fada9cf362..5629de0aa5 100755 --- a/etc/ci/describe-system-config-win.bat +++ b/etc/ci/describe-system-config-win.bat @@ -1,36 +1,40 @@ @echo off -if not defined in_subprocess (cmd /k set in_subprocess=y ^& %0 %*) & exit ) +if not defined in_subprocess (cmd /k set in_subprocess=y ^& %0 %*) & exit + +SET "SCRIPT_DIR=%~dp0" ECHO ::group::wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status -wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status +wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status & ECHO ::endgroup:: ECHO ::group::wmic cpu list /format:list -wmic cpu list /format:list +wmic cpu list /format:list & ECHO ::endgroup:: ECHO ::group::git config -l -%CYGWIN_ROOT%\bin\bash.exe -l -c 'git config -l' +%CYGWIN_ROOT%\bin\bash.exe -l -c 'git config -l' & ECHO ::endgroup:: ECHO ::group::git config --global -l -%CYGWIN_ROOT%\bin\bash.exe -l -c 'git config --global -l' +%CYGWIN_ROOT%\bin\bash.exe -l -c 'git config --global -l' & ECHO ::endgroup:: ECHO ::group::opam list -opam list +opam list & ECHO ::endgroup:: ECHO ::group::ocamlc -config -opam exec -- ocamlc -config +opam exec -- ocamlc -config & ECHO ::endgroup:: ECHO ::group::coqc --config -opam exec -- coqc --config +opam exec -- coqc --config & ECHO ::endgroup:: ECHO ::group::coqc --version -opam exec -- coqc --version +opam exec -- coqc --version & ECHO ::endgroup:: ECHO ::group::coqtop version -echo | opam exec -- coqtop +opam exec -- coqtop $null | Select-Object -First 1 + +# Get the full version of coqc, replace new lines with commas, and remove trailing comma +$COQC_VERSION = & opam exec -- coqc --version 2>$null | ForEach-Object { $_ -join ',' } | ForEach-Object { $_ -replace ',$', '' } + +# Run coqtop and capture both stdout and stderr +$COQTOP_VERSION = "" | & opam exec -- coqtop 2>$null + +# Check if GITHUB_STEP_SUMMARY and COQC_VERSION are not empty +if (![string]::IsNullOrEmpty($env:GITHUB_STEP_SUMMARY) -and ![string]::IsNullOrEmpty($COQC_VERSION)) { + # Append details to GITHUB_STEP_SUMMARY + "
$COQC_VERSION" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append + "``````" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append + $COQTOP_VERSION | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append + "``````" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append + "
" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Append +} \ No newline at end of file diff --git a/etc/ci/github-actions-record-coq-info.sh b/etc/ci/github-actions-record-coq-info.sh new file mode 100755 index 0000000000..54f227459b --- /dev/null +++ b/etc/ci/github-actions-record-coq-info.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# summarize coqc version to make it easier to read +COQC_VERSION_SHORT="$(coqc --print-version 2>/dev/null | cut -d " " -f 1)" +COQC_VERSION="$(coqc --version 2>/dev/null | tr '\n' ',' | sed 's/,$//g')" +COQTOP_VERSION="$(true | coqtop 2>&1)" +if [ ! -z "$GITHUB_STEP_SUMMARY" ] && [ ! -z "$COQC_VERSION" ]; then + printf '%s\n\n' "
${COQC_VERSION}" >> "$GITHUB_STEP_SUMMARY" + printf '%s\n' '```' >> "$GITHUB_STEP_SUMMARY" + printf '%s\n' "${COQTOP_VERSION} >> "$GITHUB_STEP_SUMMARY" + printf '%s\n%s\n' '```' '
' >> "$GITHUB_STEP_SUMMARY" +fi \ No newline at end of file