Merge pull request #226 from paketo-buildpacks/update/pipeline

Bump pipeline from 1.36.2 to 1.36.4
paketo-buildpacks · Jan 25, 2024 · 0454f39 · 0454f39
2 parents 3f4f293 + d74e1f8
commit 0454f39
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 17 deletions.
diff --git a/.github/pipeline-version b/.github/pipeline-version
@@ -1 +1 @@
-1.36.2
+1.36.4
diff --git a/.github/workflows/pb-update-jdk-11.yml b/.github/workflows/pb-update-jdk-11.yml
@@ -54,12 +54,17 @@ jobs:
 
                 set -euo pipefail
 
-                if [ -z "${ARCH}" ]; then
-                  ARCH="amd64"
+                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')
+
+                if [ -z "$OLD_VERSION" ]; then
+                  ARCH="" # empty means noarch
+                  OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version")
                 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")
+                echo $OLD_VERSION
+                exit 0
 
                 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
@@ -54,12 +54,17 @@ jobs:
 
                 set -euo pipefail
 
-                if [ -z "${ARCH}" ]; then
-                  ARCH="amd64"
+                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')
+
+                if [ -z "$OLD_VERSION" ]; then
+                  ARCH="" # empty means noarch
+                  OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version")
                 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")
+                echo $OLD_VERSION
+                exit 0
 
                 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
@@ -54,12 +54,17 @@ jobs:
 
                 set -euo pipefail
 
-                if [ -z "${ARCH}" ]; then
-                  ARCH="amd64"
+                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')
+
+                if [ -z "$OLD_VERSION" ]; then
+                  ARCH="" # empty means noarch
+                  OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version")
                 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")
+                echo $OLD_VERSION
+                exit 0
 
                 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
@@ -54,12 +54,17 @@ jobs:
 
                 set -euo pipefail
 
-                if [ -z "${ARCH}" ]; then
-                  ARCH="amd64"
+                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')
+
+                if [ -z "$OLD_VERSION" ]; then
+                  ARCH="" # empty means noarch
+                  OLD_VERSION=$(echo "$VERSION_DEPS" | jq -r ".version")
                 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")
+                echo $OLD_VERSION
+                exit 0
 
                 update-buildpack-dependency \
                   --buildpack-toml buildpack.toml \