diff --git a/.github/pipeline-version b/.github/pipeline-version index c6a567b..f2fb3d7 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.36.2 +1.36.5 diff --git a/.github/workflows/pb-update-syft-cli-arm-64.yml b/.github/workflows/pb-update-syft-cli-arm-64.yml index 4b2e140..d65c8e7 100644 --- a/.github/workflows/pb-update-syft-cli-arm-64.yml +++ b/.github/workflows/pb-update-syft-cli-arm-64.yml @@ -57,12 +57,14 @@ jobs: set -euo pipefail - if [ -z "${ARCH}" ]; then - ARCH="amd64" - fi + VERSION_DEPS=$(yj -tj < buildpack.toml | jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) )") + ARCH=${ARCH:-amd64} + OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r 'select( .purl | contains( env.ARCH ) ) | .version') - OLD_VERSION=$(yj -tj < buildpack.toml | \ - jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") + if [ -z "$OLD_VERSION" ]; then + ARCH="" # empty means noarch + OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version") + fi update-buildpack-dependency \ --buildpack-toml buildpack.toml \ diff --git a/.github/workflows/pb-update-syft-cli.yml b/.github/workflows/pb-update-syft-cli.yml index 34b9e49..b785353 100644 --- a/.github/workflows/pb-update-syft-cli.yml +++ b/.github/workflows/pb-update-syft-cli.yml @@ -56,12 +56,14 @@ jobs: set -euo pipefail - if [ -z "${ARCH}" ]; then - ARCH="amd64" - fi + VERSION_DEPS=$(yj -tj < buildpack.toml | jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) )") + ARCH=${ARCH:-amd64} + OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r 'select( .purl | contains( env.ARCH ) ) | .version') - OLD_VERSION=$(yj -tj < buildpack.toml | \ - jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") + if [ -z "$OLD_VERSION" ]; then + ARCH="" # empty means noarch + OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version") + fi update-buildpack-dependency \ --buildpack-toml buildpack.toml \