From a1385e6189fa388a521c1fb4543d00e2e93b59c9 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Thu, 25 Jan 2024 05:12:35 +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-jdk-11.yml | 12 +++++++----- .github/workflows/pb-update-jdk-17.yml | 12 +++++++----- .github/workflows/pb-update-jdk-21.yml | 12 +++++++----- .github/workflows/pb-update-jdk-8.yml | 12 +++++++----- .github/workflows/pb-update-jre-11.yml | 12 +++++++----- .github/workflows/pb-update-jre-17.yml | 12 +++++++----- .github/workflows/pb-update-jre-21.yml | 12 +++++++----- .github/workflows/pb-update-jre-8.yml | 12 +++++++----- 9 files changed, 57 insertions(+), 41 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-jdk-11.yml b/.github/workflows/pb-update-jdk-11.yml index e7584ca..9b22e5e 100644 --- a/.github/workflows/pb-update-jdk-11.yml +++ b/.github/workflows/pb-update-jdk-11.yml @@ -54,12 +54,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-jdk-17.yml b/.github/workflows/pb-update-jdk-17.yml index 2445e83..db3173f 100644 --- a/.github/workflows/pb-update-jdk-17.yml +++ b/.github/workflows/pb-update-jdk-17.yml @@ -54,12 +54,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-jdk-21.yml b/.github/workflows/pb-update-jdk-21.yml index cdb098b..593421e 100644 --- a/.github/workflows/pb-update-jdk-21.yml +++ b/.github/workflows/pb-update-jdk-21.yml @@ -54,12 +54,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-jdk-8.yml b/.github/workflows/pb-update-jdk-8.yml index b5ef23d..c549f57 100644 --- a/.github/workflows/pb-update-jdk-8.yml +++ b/.github/workflows/pb-update-jdk-8.yml @@ -54,12 +54,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-jre-11.yml b/.github/workflows/pb-update-jre-11.yml index b3a9b8e..5176067 100644 --- a/.github/workflows/pb-update-jre-11.yml +++ b/.github/workflows/pb-update-jre-11.yml @@ -54,12 +54,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-jre-17.yml b/.github/workflows/pb-update-jre-17.yml index 283dd46..2b49348 100644 --- a/.github/workflows/pb-update-jre-17.yml +++ b/.github/workflows/pb-update-jre-17.yml @@ -54,12 +54,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-jre-21.yml b/.github/workflows/pb-update-jre-21.yml index a1cffd9..5cdb071 100644 --- a/.github/workflows/pb-update-jre-21.yml +++ b/.github/workflows/pb-update-jre-21.yml @@ -54,12 +54,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-jre-8.yml b/.github/workflows/pb-update-jre-8.yml index 8ba7b00..c3fa168 100644 --- a/.github/workflows/pb-update-jre-8.yml +++ b/.github/workflows/pb-update-jre-8.yml @@ -54,12 +54,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 \