diff --git a/.github/workflows/regression_test.yml b/.github/workflows/regression_test.yml index 73de83c..858f9fb 100644 --- a/.github/workflows/regression_test.yml +++ b/.github/workflows/regression_test.yml @@ -22,7 +22,7 @@ jobs: # The reusable test job scopes its token separately. pages: write id-token: write - uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@b37cd4a81a1cb8c2ebefc438220ab7f009e13362 + uses: eclipse-threadx/threadx/.github/workflows/regression_template.yml@c735b12c714e27431374a40163aa0af9619a52d3 with: coverage_name: merged coverage_thresholds: '68 100' diff --git a/scripts/install.sh b/scripts/install.sh index 17575bc..b5381e2 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -10,6 +10,8 @@ # SPDX-License-Identifier: MIT ############################################################################## +# Portions of this file were generated with AI assistance. + set -euo pipefail # Retry transient package and network failures a bounded number of times. @@ -30,9 +32,14 @@ apt_options=(-o Acquire::Retries=3 -o DPkg::Lock::Timeout=60) if ! retry sudo timeout 150 apt-get "${apt_options[@]}" update; then echo "Package index update failed; package installation will verify availability." >&2 fi -retry sudo timeout 150 apt-get "${apt_options[@]}" install -y \ - cmake gcc-14 gcc-14-multilib git ninja-build python3-venv \ - unifdef p7zip-full tofrodos gawk +# CMake is installed only when none is on PATH. A GitHub runner image carries a +# newer one in /usr/local/bin, which shadows the apt package. +packages=(gcc-14 gcc-14-multilib git ninja-build python3-venv + unifdef p7zip-full tofrodos gawk) +if ! command -v cmake > /dev/null; then + packages+=(cmake) +fi +retry sudo timeout 150 apt-get "${apt_options[@]}" install -y "${packages[@]}" venv_dir="${RUNNER_TEMP:-${TMPDIR:-/tmp}}/levelx-ci-venv" python3 -m venv "$venv_dir"