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

Bump pipeline from 1.36.2 to 1.36.5
paketo-buildpacks · Jan 25, 2024 · d2810ae · d2810ae
2 parents ecd9f27 + 7a01f2e
commit d2810ae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.github/pipeline-version b/.github/pipeline-version
@@ -1 +1 @@
-1.36.2
+1.36.5
diff --git a/.github/workflows/pb-update-datadog-agent-java.yml b/.github/workflows/pb-update-datadog-agent-java.yml
@@ -55,12 +55,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-datadog-agent-nodejs.yml b/.github/workflows/pb-update-datadog-agent-nodejs.yml
@@ -52,12 +52,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 \