From 532ffb99cfe3c5faa41f6bf835f107fe40e0c632 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Fri, 19 Jan 2024 00:51:49 -0500 Subject: [PATCH] Pipeline builder fix for cases where there is no ARCH set Signed-off-by: Daniel Mikusa --- .github/workflows/pb-update-jdk-11-arm-64.yml | 4 ++++ .github/workflows/pb-update-jdk-11.yml | 4 ++++ .github/workflows/pb-update-jdk-17-arm-64.yml | 4 ++++ .github/workflows/pb-update-jdk-17.yml | 4 ++++ .github/workflows/pb-update-jdk-21-arm-64.yml | 4 ++++ .github/workflows/pb-update-jdk-21.yml | 4 ++++ .github/workflows/pb-update-jdk-8-arm-64.yml | 4 ++++ .github/workflows/pb-update-jdk-8.yml | 4 ++++ .github/workflows/pb-update-jre-11-arm-64.yml | 4 ++++ .github/workflows/pb-update-jre-11.yml | 4 ++++ .github/workflows/pb-update-jre-17-arm-64.yml | 4 ++++ .github/workflows/pb-update-jre-17.yml | 4 ++++ .github/workflows/pb-update-jre-21-arm-64.yml | 4 ++++ .github/workflows/pb-update-jre-21.yml | 4 ++++ .github/workflows/pb-update-jre-8-arm-64.yml | 4 ++++ .github/workflows/pb-update-jre-8.yml | 4 ++++ .github/workflows/pb-update-native-image-11-arm-64.yml | 4 ++++ .github/workflows/pb-update-native-image-11.yml | 4 ++++ .github/workflows/pb-update-native-image-17-arm-64.yml | 4 ++++ .github/workflows/pb-update-native-image-17.yml | 4 ++++ .github/workflows/pb-update-native-image-21-arm-64.yml | 4 ++++ .github/workflows/pb-update-native-image-21.yml | 4 ++++ 22 files changed, 88 insertions(+) diff --git a/.github/workflows/pb-update-jdk-11-arm-64.yml b/.github/workflows/pb-update-jdk-11-arm-64.yml index 82429296..88320d56 100644 --- a/.github/workflows/pb-update-jdk-11-arm-64.yml +++ b/.github/workflows/pb-update-jdk-11-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jdk-11.yml b/.github/workflows/pb-update-jdk-11.yml index a9f5f855..a028e41c 100644 --- a/.github/workflows/pb-update-jdk-11.yml +++ b/.github/workflows/pb-update-jdk-11.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jdk-17-arm-64.yml b/.github/workflows/pb-update-jdk-17-arm-64.yml index 3cd01f8d..fd13eef6 100644 --- a/.github/workflows/pb-update-jdk-17-arm-64.yml +++ b/.github/workflows/pb-update-jdk-17-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jdk-17.yml b/.github/workflows/pb-update-jdk-17.yml index 8000eb07..33a0be69 100644 --- a/.github/workflows/pb-update-jdk-17.yml +++ b/.github/workflows/pb-update-jdk-17.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jdk-21-arm-64.yml b/.github/workflows/pb-update-jdk-21-arm-64.yml index aa61f5f2..0a062d00 100644 --- a/.github/workflows/pb-update-jdk-21-arm-64.yml +++ b/.github/workflows/pb-update-jdk-21-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jdk-21.yml b/.github/workflows/pb-update-jdk-21.yml index 9553c601..3f37ec0d 100644 --- a/.github/workflows/pb-update-jdk-21.yml +++ b/.github/workflows/pb-update-jdk-21.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jdk-8-arm-64.yml b/.github/workflows/pb-update-jdk-8-arm-64.yml index f7a6a3e9..cf83b63b 100644 --- a/.github/workflows/pb-update-jdk-8-arm-64.yml +++ b/.github/workflows/pb-update-jdk-8-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jdk-8.yml b/.github/workflows/pb-update-jdk-8.yml index 11c23799..115050bc 100644 --- a/.github/workflows/pb-update-jdk-8.yml +++ b/.github/workflows/pb-update-jdk-8.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-11-arm-64.yml b/.github/workflows/pb-update-jre-11-arm-64.yml index 20f8a857..c905a35d 100644 --- a/.github/workflows/pb-update-jre-11-arm-64.yml +++ b/.github/workflows/pb-update-jre-11-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-11.yml b/.github/workflows/pb-update-jre-11.yml index 735dfd57..519f0b88 100644 --- a/.github/workflows/pb-update-jre-11.yml +++ b/.github/workflows/pb-update-jre-11.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-17-arm-64.yml b/.github/workflows/pb-update-jre-17-arm-64.yml index 1cba76ba..68cea6fa 100644 --- a/.github/workflows/pb-update-jre-17-arm-64.yml +++ b/.github/workflows/pb-update-jre-17-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-17.yml b/.github/workflows/pb-update-jre-17.yml index f3c17d47..fbdc935b 100644 --- a/.github/workflows/pb-update-jre-17.yml +++ b/.github/workflows/pb-update-jre-17.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-21-arm-64.yml b/.github/workflows/pb-update-jre-21-arm-64.yml index 5e0e8494..3731709d 100644 --- a/.github/workflows/pb-update-jre-21-arm-64.yml +++ b/.github/workflows/pb-update-jre-21-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-21.yml b/.github/workflows/pb-update-jre-21.yml index 96f002d7..77180395 100644 --- a/.github/workflows/pb-update-jre-21.yml +++ b/.github/workflows/pb-update-jre-21.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-8-arm-64.yml b/.github/workflows/pb-update-jre-8-arm-64.yml index c586e130..b4799da7 100644 --- a/.github/workflows/pb-update-jre-8-arm-64.yml +++ b/.github/workflows/pb-update-jre-8-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-jre-8.yml b/.github/workflows/pb-update-jre-8.yml index ea1556be..0d0d2b24 100644 --- a/.github/workflows/pb-update-jre-8.yml +++ b/.github/workflows/pb-update-jre-8.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-native-image-11-arm-64.yml b/.github/workflows/pb-update-native-image-11-arm-64.yml index 2eeafce8..1805f600 100644 --- a/.github/workflows/pb-update-native-image-11-arm-64.yml +++ b/.github/workflows/pb-update-native-image-11-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-native-image-11.yml b/.github/workflows/pb-update-native-image-11.yml index 2890e6d3..38a9d57a 100644 --- a/.github/workflows/pb-update-native-image-11.yml +++ b/.github/workflows/pb-update-native-image-11.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-native-image-17-arm-64.yml b/.github/workflows/pb-update-native-image-17-arm-64.yml index aeed2813..3b16e8ed 100644 --- a/.github/workflows/pb-update-native-image-17-arm-64.yml +++ b/.github/workflows/pb-update-native-image-17-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-native-image-17.yml b/.github/workflows/pb-update-native-image-17.yml index e4be9047..8a4fe0b2 100644 --- a/.github/workflows/pb-update-native-image-17.yml +++ b/.github/workflows/pb-update-native-image-17.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-native-image-21-arm-64.yml b/.github/workflows/pb-update-native-image-21-arm-64.yml index e08bd695..1a0caf5c 100644 --- a/.github/workflows/pb-update-native-image-21-arm-64.yml +++ b/.github/workflows/pb-update-native-image-21-arm-64.yml @@ -55,6 +55,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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") diff --git a/.github/workflows/pb-update-native-image-21.yml b/.github/workflows/pb-update-native-image-21.yml index 43a990b9..9f978a63 100644 --- a/.github/workflows/pb-update-native-image-21.yml +++ b/.github/workflows/pb-update-native-image-21.yml @@ -54,6 +54,10 @@ jobs: set -euo pipefail + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + 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")