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

Bump pipeline from 1.11.0 to 1.11.0
paketo-buildpacks · Oct 8, 2021 · 1e57f0b · 1e57f0b
2 parents f8e469b + 4087a55
commit 1e57f0b
Show file tree

Hide file tree

Showing 21 changed files with 224 additions and 122 deletions.
diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -64,8 +64,8 @@ jobs:
                 | tar -C "${HOME}"/bin -xz pack
               env:
                 PACK_VERSION: 0.18.1
-            - if: ${{ false }}
-              name: Enable pack Experimental
+            - name: Enable pack Experimental
+              if: ${{ false }}
               run: |
                 #!/usr/bin/env bash
 
@@ -84,8 +84,8 @@ jobs:
                     ${{ env.HOME }}/.pack
                     ${{ env.HOME }}/carton-cache
                 restore-keys: ${{ runner.os }}-go-
-            - id: version
-              name: Compute Version
+            - name: Compute Version
+              id: version
               run: |
                 #!/usr/bin/env bash
 
@@ -128,23 +128,23 @@ jobs:
                 INCLUDE_DEPENDENCIES: "false"
                 OS: linux
                 VERSION: ${{ steps.version.outputs.version }}
-            - id: package
-              name: Package Buildpack
+            - name: Package Buildpack
+              id: package
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 if [[ -n "${PUBLISH+x}" ]]; then
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --publish
 
                   crane tag "${PACKAGE}:${VERSION}" latest
                   echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")"
                 else
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --format "${FORMAT}"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,8 +39,8 @@ jobs:
                 | tar -C "${HOME}"/bin -xz pack
               env:
                 PACK_VERSION: 0.18.1
-            - if: ${{ false }}
-              name: Enable pack Experimental
+            - name: Enable pack Experimental
+              if: ${{ false }}
               run: |
                 #!/usr/bin/env bash
 
@@ -58,8 +58,8 @@ jobs:
                     ${{ env.HOME }}/.pack
                     ${{ env.HOME }}/carton-cache
                 restore-keys: ${{ runner.os }}-go-
-            - id: version
-              name: Compute Version
+            - name: Compute Version
+              id: version
               run: |
                 #!/usr/bin/env bash
 
@@ -109,15 +109,15 @@ jobs:
                 set -euo pipefail
 
                 if [[ -n "${PUBLISH+x}" ]]; then
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --publish
 
                   crane tag "${PACKAGE}:${VERSION}" latest
                   echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")"
                 else
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --format "${FORMAT}"

diff --git a/.github/workflows/update-apache-tomcat.yml b/.github/workflows/update-apache-tomcat.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml

diff --git a/.github/workflows/update-azure-application-insights.yml b/.github/workflows/update-azure-application-insights.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml

diff --git a/.github/workflows/update-ca-certificates.yml b/.github/workflows/update-ca-certificates.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml

diff --git a/.github/workflows/update-clojure-tools.yml b/.github/workflows/update-clojure-tools.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml

diff --git a/.github/workflows/update-dist-zip.yml b/.github/workflows/update-dist-zip.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml

diff --git a/.github/workflows/update-draft-release.yml b/.github/workflows/update-draft-release.yml
@@ -13,8 +13,8 @@ jobs:
               uses: release-drafter/release-drafter@v5
               env:
                 GITHUB_TOKEN: ${{ secrets.JAVA_GITHUB_TOKEN }}
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}

diff --git a/.github/workflows/update-encrypt-at-rest.yml b/.github/workflows/update-encrypt-at-rest.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml