Merge branch 'main' into dualarch

paketo-buildpacks · May 10, 2024 · 938daf5 · 938daf5
2 parents ce558f4 + b1d519f
commit 938daf5
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 23 deletions.
diff --git a/.github/pipeline-version b/.github/pipeline-version
@@ -1 +1 @@
-1.37.5
+1.38.0
diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml
@@ -184,7 +184,27 @@ jobs:
                      crane tag "${P}:${VERSION}" "${VERSION_MINOR}"
                      crane tag "${P}:${VERSION}" "${VERSION_MAJOR}"
                   fi
-                  # crane tag "${P}:${VERSION}" latest
+
+                  crane tag "${PACKAGE}:${VERSION}" latest
+                  echo "digest=$(crane digest "${PACKAGE}:${VERSION}")" >> "$GITHUB_OUTPUT"
+
+                  # copy to other repositories specified
+                  for P in "${PACKAGE_LIST[@]}"
+                    do
+                      if [ "$P" != "$PACKAGE" ]; then
+                        crane copy "${PACKAGE}:${VERSION}" "${P}:${VERSION}"
+                        if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then
+                           crane tag "${P}:${VERSION}" "${VERSION_MINOR}"
+                           crane tag "${P}:${VERSION}" "${VERSION_MAJOR}"
+                        fi
+                        crane tag "${P}:${VERSION}" latest
+                      fi
+                    done
+
+                else
+                  pack -v buildpack package \
+                    "${PACKAGE}:${VERSION}" ${CONFIG} \
+                    --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish")
                 fi
               done
           

diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml
@@ -173,7 +173,7 @@ jobs:
                 else
                   pack -v buildpack package \
                     "${PACKAGE}:${VERSION}" ${CONFIG} \
-                    --format "${FORMAT}"
+                    --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish")
                 fi
               env:
                 FORMAT: image

diff --git a/buildpack.toml b/buildpack.toml
@@ -38,7 +38,7 @@ api = "0.7"
 
   [[order.group]]
     id = "paketo-buildpacks/bellsoft-liberica"
-    version = "10.6.0"
+    version = "10.7.1"
 
   [[order.group]]
     id = "paketo-buildpacks/yarn"
@@ -63,7 +63,7 @@ api = "0.7"
   [[order.group]]
     id = "paketo-buildpacks/clojure-tools"
     optional = true
-    version = "2.9.0"
+    version = "2.9.1"
 
   [[order.group]]
     id = "paketo-buildpacks/gradle"
@@ -83,7 +83,7 @@ api = "0.7"
   [[order.group]]
     id = "paketo-buildpacks/watchexec"
     optional = true
-    version = "2.10.0"
+    version = "3.1.1"
 
   [[order.group]]
     id = "paketo-buildpacks/executable-jar"
@@ -98,12 +98,12 @@ api = "0.7"
   [[order.group]]
     id = "paketo-buildpacks/apache-tomee"
     optional = true
-    version = "1.8.2"
+    version = "1.9.0"
 
   [[order.group]]
     id = "paketo-buildpacks/liberty"
     optional = true
-    version = "4.0.4"
+    version = "4.1.0"
 
   [[order.group]]
     id = "paketo-buildpacks/dist-zip"
@@ -113,12 +113,12 @@ api = "0.7"
   [[order.group]]
     id = "paketo-buildpacks/spring-boot"
     optional = true
-    version = "5.28.0"
+    version = "5.29.0"
 
   [[order.group]]
     id = "paketo-buildpacks/procfile"
     optional = true
-    version = "5.7.0"
+    version = "5.8.0"
 
   [[order.group]]
     id = "paketo-buildpacks/jattach"
@@ -128,7 +128,7 @@ api = "0.7"
   [[order.group]]
     id = "paketo-buildpacks/azure-application-insights"
     optional = true
-    version = "5.19.1"
+    version = "5.20.0"
 
   [[order.group]]
     id = "paketo-buildpacks/google-stackdriver"
@@ -138,7 +138,7 @@ api = "0.7"
   [[order.group]]
     id = "paketo-buildpacks/datadog"
     optional = true
-    version = "5.8.0"
+    version = "5.11.0"
 
   [[order.group]]
     id = "paketo-buildpacks/java-memory-assistant"
@@ -148,7 +148,7 @@ api = "0.7"
   [[order.group]]
     id = "paketo-buildpacks/encrypt-at-rest"
     optional = true
-    version = "4.6.0"
+    version = "4.6.1"
 
   [[order.group]]
     id = "paketo-buildpacks/environment-variables"

diff --git a/package.toml b/package.toml
@@ -2,7 +2,7 @@
   uri = "docker://gcr.io/paketo-buildpacks/ca-certificates:3.7.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/bellsoft-liberica:10.6.0"
+  uri = "docker://gcr.io/paketo-buildpacks/bellsoft-liberica:10.7.1"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/yarn:1.3.2"
@@ -17,7 +17,7 @@
   uri = "docker://gcr.io/paketo-buildpacks/leiningen:4.8.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/clojure-tools:2.9.0"
+  uri = "docker://gcr.io/paketo-buildpacks/clojure-tools:2.9.1"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/gradle:7.10.0"
@@ -29,7 +29,7 @@
   uri = "docker://gcr.io/paketo-buildpacks/sbt:6.13.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/watchexec:2.10.0"
+  uri = "docker://gcr.io/paketo-buildpacks/watchexec:3.1.1"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/executable-jar:6.9.0"
@@ -38,37 +38,37 @@
   uri = "docker://gcr.io/paketo-buildpacks/apache-tomcat:7.16.1"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/apache-tomee:1.8.2"
+  uri = "docker://gcr.io/paketo-buildpacks/apache-tomee:1.9.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/liberty:4.0.4"
+  uri = "docker://gcr.io/paketo-buildpacks/liberty:4.1.0"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/dist-zip:5.7.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/spring-boot:5.28.0"
+  uri = "docker://gcr.io/paketo-buildpacks/spring-boot:5.29.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/procfile:5.7.0"
+  uri = "docker://gcr.io/paketo-buildpacks/procfile:5.8.0"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/jattach:1.7.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/azure-application-insights:5.19.1"
+  uri = "docker://gcr.io/paketo-buildpacks/azure-application-insights:5.20.0"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/google-stackdriver:9.0.1"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/datadog:5.8.0"
+  uri = "docker://gcr.io/paketo-buildpacks/datadog:5.11.0"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/java-memory-assistant:1.5.0"
 
 [[dependencies]]
-  uri = "docker://gcr.io/paketo-buildpacks/encrypt-at-rest:4.6.0"
+  uri = "docker://gcr.io/paketo-buildpacks/encrypt-at-rest:4.6.1"
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/environment-variables:4.6.0"