From 840494ea0a737e6ddfff4d57248241240351a6fb Mon Sep 17 00:00:00 2001 From: paketocommunity Date: Thu, 25 Jan 2024 05:17:36 +0000 Subject: [PATCH] Bump pipeline from 1.36.2 to 1.36.5 Bumps pipeline from 1.36.2 to 1.36.5. Signed-off-by: GitHub --- .github/pipeline-version | 2 +- .github/workflows/pb-update-rustup-init-gnu.yml | 12 +++++++----- .github/workflows/pb-update-rustup-init-musl.yml | 12 +++++++----- 3 files changed, 15 insertions(+), 11 deletions(-) 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-rustup-init-gnu.yml b/.github/workflows/pb-update-rustup-init-gnu.yml index c84aa4d..e72b48e 100644 --- a/.github/workflows/pb-update-rustup-init-gnu.yml +++ b/.github/workflows/pb-update-rustup-init-gnu.yml @@ -53,12 +53,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-rustup-init-musl.yml b/.github/workflows/pb-update-rustup-init-musl.yml index a803ff9..7c0b6a5 100644 --- a/.github/workflows/pb-update-rustup-init-musl.yml +++ b/.github/workflows/pb-update-rustup-init-musl.yml @@ -53,12 +53,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 \