diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b55515b..6be1ac7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -207,7 +207,7 @@ jobs: - run: rm -- Cargo.toml - name: Generate tool list id: tool-list - run: tools/ci/tool-list.sh >>"${GITHUB_OUTPUT}" + run: tools/ci/tool-list.sh "" "${{ matrix.container }}" >>"${GITHUB_OUTPUT}" # remove bash installed by checkout-action - run: apk --no-cache del bash shell: sh diff --git a/tools/ci/tool-list.sh b/tools/ci/tool-list.sh index 9b91fa37..8d951014 100755 --- a/tools/ci/tool-list.sh +++ b/tools/ci/tool-list.sh @@ -62,6 +62,7 @@ case "${1:-}" in exit 1 ;; esac +runner="${2:-}" case "$(uname -s)" in Linux) host_os=linux @@ -111,6 +112,9 @@ case "$(uname -s)" in if ! type -P apt-get >/dev/null; then incompat_tools+=(cyclonedx) fi + if [[ "${runner}" == "ubuntu:14.04" ]]; then + incompat_tools+=(cyclonedx) + fi ;; Darwin) host_os=macos ;; MINGW* | MSYS* | CYGWIN* | Windows_NT) host_os=windows ;;