Bump pipeline from 1.36.6 to 1.40.0

Bumps pipeline from 1.36.6 to 1.40.0. Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
initializ-buildpacks · Aug 22, 2024 · eeb55d5 · eeb55d5
1 parent 6a21049
commit eeb55d5
Show file tree

Hide file tree

Showing 15 changed files with 87 additions and 82 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @initializ-buildpacks/java-maintainers
+* @paketo-buildpacks/java-maintainers
diff --git a/.github/pipeline-version b/.github/pipeline-version
@@ -1 +1 @@
-1.36.6
+1.40.0
diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml
@@ -9,41 +9,37 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
+            - 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@v3
+              with:
+                password: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
+                registry: gcr.io
+                username: _json_key
             - name: Docker login docker.io
               if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v3
               with:
-                password: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_PASSWORD }}
+                password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
                 registry: docker.io
-                username: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_USERNAME }}
+                username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
             - uses: actions/setup-go@v5
               with:
-                go-version: "1.22.5"
+                go-version: "1.22"
             - name: Install create-package
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest
-            - uses: buildpacks/github-actions/setup-tools@v5.6.0
+            - uses: buildpacks/github-actions/setup-tools@v5.7.2
               with:
                 crane-version: 0.19.1
                 yj-version: 5.1.0
-            - name: Install pack
-              run: |
-                #!/usr/bin/env bash
-                # this is coming from a copy of https://github.com/buildpacks/pack/actions/runs/8118576298 stored on box
-                # TODO to revisit when the official one is out
-                set -euo pipefail
-
-                echo "Installing pack experimental"
-
-                mkdir -p "${HOME}"/bin
-                echo "${HOME}/bin" >> "${GITHUB_PATH}"
-
-                curl -L "https://github.com/buildpacks/pack/releases/download/v0.34.2/pack-v0.34.2-linux.tgz" | tar xvz -C "${HOME}/bin"
-                chmod +x "${HOME}"/bin/pack
+            - uses: buildpacks/github-actions/[email protected]
+              with:
+                pack-version: 0.34.2
             - name: Enable pack Experimental
               if: ${{ false }}
               run: |
@@ -184,7 +180,7 @@ jobs:
                     --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish")
                 fi
               env:
-                PACKAGES: docker.io/initializbuildpacks/apache-tomcat
+                PACKAGES: docker.io/paketobuildpacks/apache-tomcat gcr.io/initializ-buildpacks/apache-tomcat
                 PUBLISH: "true"
                 VERSION: ${{ steps.version.outputs.version }}
                 VERSION_MAJOR: ${{ steps.version.outputs.version-major }}
@@ -210,11 +206,11 @@ jobs:
                   --field "body=${RELEASE_BODY//<!-- DIGEST PLACEHOLDER -->/\`${DIGEST}\`}"
               env:
                 DIGEST: ${{ steps.package.outputs.digest }}
-                GITHUB_TOKEN: ${{ secrets.PAT }}
+                GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
             - if: ${{ true }}
-              uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.6.0
+              uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.7.2
               with:
-                address: docker.io/initializbuildpacks/apache-tomcat@${{ steps.package.outputs.digest }}
+                address: docker.io/paketobuildpacks/apache-tomcat@${{ steps.package.outputs.digest }}
                 id: initializ-buildpacks/apache-tomcat
-                token: ${{ secrets.PAT }}
-                version: ${{ steps.version.outputs.version }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
+                version: ${{ steps.version.outputs.version }}
diff --git a/.github/workflows/pb-synchronize-labels.yml b/.github/workflows/pb-synchronize-labels.yml
@@ -14,4 +14,4 @@ jobs:
             - uses: actions/checkout@v4
             - uses: micnncim/action-label-syncer@v1
               env:
-                GITHUB_TOKEN: ${{ secrets.PAT }}
+                GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml
@@ -15,6 +15,20 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
+            - 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@v3
+              with:
+                password: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
+                registry: gcr.io
+                username: _json_key
+            - name: Docker login docker.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
+              uses: docker/login-action@v3
+              with:
+                password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
+                registry: docker.io
+                username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
             - uses: actions/setup-go@v5
               with:
                 go-version: "1.22"
@@ -25,20 +39,9 @@ jobs:
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest
-            - name: Install pack
-              run: |
-                #!/usr/bin/env bash
-                # this is coming from a copy of https://github.com/buildpacks/pack/actions/runs/8118576298 stored on box
-                # TODO to revisit when the official one is out
-                set -euo pipefail
-
-                echo "Installing pack experimental"
-
-                mkdir -p "${HOME}"/bin
-                echo "${HOME}/bin" >> "${GITHUB_PATH}"
-
-                curl -L "https://ent.box.com/shared/static/j4d1bfe9uk1sb0i7zjvci0md9xmy41u4" -o ${HOME}/bin/pack
-                chmod +x "${HOME}"/bin/pack
+            - uses: buildpacks/github-actions/[email protected]
+              with:
+                pack-version: 0.34.2
             - name: Enable pack Experimental
               if: ${{ false }}
               run: |
@@ -221,4 +224,4 @@ jobs:
 
                 richgo test ./...
               env:
-                RICHGO_FORCE_COLOR: "1"
+                RICHGO_FORCE_COLOR: "1"
diff --git a/.github/workflows/pb-update-draft-release.yml b/.github/workflows/pb-update-draft-release.yml
@@ -12,13 +12,13 @@ jobs:
             - id: release-drafter
               uses: release-drafter/release-drafter@v5
               env:
-                GITHUB_TOKEN: ${{ secrets.PAT }}
+                GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
             - uses: actions/checkout@v4
             - name: Update draft release with buildpack information
               uses: docker://ghcr.io/paketo-buildpacks/actions/draft-release:main
               with:
-                github_token: ${{ secrets.PAT }}
+                github_token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
                 release_body: ${{ steps.release-drafter.outputs.body }}
                 release_id: ${{ steps.release-drafter.outputs.id }}
                 release_name: ${{ steps.release-drafter.outputs.name }}
-                release_tag_name: ${{ steps.release-drafter.outputs.tag_name }}
+                release_tag_name: ${{ steps.release-drafter.outputs.tag_name }}
diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml
@@ -1,18 +1,18 @@
 name: Update Go
 "on":
     schedule:
-        - cron: 13 2 * * 1
+        - cron: 9 2 * * 1
     workflow_dispatch: {}
 jobs:
     update:
         name: Update Go
         runs-on:
             - ubuntu-latest
         steps:
-            - uses: actions/setup-go@v4
+            - uses: actions/setup-go@v5
               with:
-                go-version: "stable"
-            - uses: actions/checkout@v3
+                go-version: "1.22"
+            - uses: actions/checkout@v4
             - name: Update Go Version & Modules
               id: update-go
               run: |
@@ -49,8 +49,8 @@ jobs:
                 echo "commit-body=${COMMIT_BODY}" >> "$GITHUB_OUTPUT"
                 echo "commit-semver=${COMMIT_SEMVER}" >> "$GITHUB_OUTPUT"
               env:
-                GO_VERSION: "1.22.5"
-            - uses: peter-evans/create-pull-request@v5
+                GO_VERSION: "1.22"
+            - uses: peter-evans/create-pull-request@v6
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: |-
@@ -69,4 +69,4 @@ jobs:
                 labels: ${{ steps.update-go.outputs.commit-semver }}, type:task
                 signoff: true
                 title: ${{ steps.update-go.outputs.commit-title }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml
@@ -55,6 +55,12 @@ jobs:
                 )
 
                 git add .github/
+                git add .gitignore
+
+                if [ -f scripts/build.sh ]; then
+                  git add scripts/build.sh
+                fi
+
                 git checkout -- .
 
                 echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
@@ -64,7 +70,7 @@ jobs:
                 printf "release-notes<<%s\n%s\n%s\n" "${DELIMITER}" "${RELEASE_NOTES}" "${DELIMITER}" >> "${GITHUB_OUTPUT}" # see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
               env:
                 DESCRIPTOR: .github/pipeline-descriptor.yml
-                GITHUB_TOKEN: ${{ secrets.PAT }}
+                GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
             - uses: peter-evans/create-pull-request@v6
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
@@ -84,4 +90,4 @@ jobs:
                 labels: semver:patch, type:task
                 signoff: true
                 title: Bump pipeline from ${{ steps.pipeline.outputs.old-version }} to ${{ steps.pipeline.outputs.new-version }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-tomcat-10-1.yml b/.github/workflows/pb-update-tomcat-10-1.yml
@@ -11,17 +11,17 @@ jobs:
         steps:
             - uses: actions/setup-go@v5
               with:
-                go-version: "1.22.5"
+                go-version: "1.22"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
-            - uses: buildpacks/github-actions/setup-tools@v5.5.3
+            - uses: buildpacks/github-actions/setup-tools@v5.7.2
               with:
-                crane-version: 0.19.0
+                crane-version: 0.19.1
                 yj-version: 5.1.0
             - uses: actions/checkout@v4
             - id: dependency
@@ -100,4 +100,4 @@ jobs:
                 labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
                 signoff: true
                 title: Bump Tomcat 10.1 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-tomcat-10.yml b/.github/workflows/pb-update-tomcat-10.yml
@@ -11,17 +11,17 @@ jobs:
         steps:
             - uses: actions/setup-go@v5
               with:
-                go-version: "1.22.5"
+                go-version: "1.22"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
-            - uses: buildpacks/github-actions/setup-tools@v5.5.3
+            - uses: buildpacks/github-actions/setup-tools@v5.7.2
               with:
-                crane-version: 0.19.0
+                crane-version: 0.19.1
                 yj-version: 5.1.0
             - uses: actions/checkout@v4
             - id: dependency
@@ -100,4 +100,4 @@ jobs:
                 labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
                 signoff: true
                 title: Bump Tomcat 10 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-tomcat-8.yml b/.github/workflows/pb-update-tomcat-8.yml
@@ -11,17 +11,17 @@ jobs:
         steps:
             - uses: actions/setup-go@v5
               with:
-                go-version: "1.22.5"
+                go-version: "1.22"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
-            - uses: buildpacks/github-actions/setup-tools@v5.5.3
+            - uses: buildpacks/github-actions/setup-tools@v5.7.2
               with:
-                crane-version: 0.19.0
+                crane-version: 0.19.1
                 yj-version: 5.1.0
             - uses: actions/checkout@v4
             - id: dependency
@@ -99,4 +99,4 @@ jobs:
                 labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
                 signoff: true
                 title: Bump Tomcat 8 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-tomcat-9.yml b/.github/workflows/pb-update-tomcat-9.yml
@@ -11,17 +11,17 @@ jobs:
         steps:
             - uses: actions/setup-go@v5
               with:
-                go-version: "1.22.5"
+                go-version: "1.22"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
-            - uses: buildpacks/github-actions/setup-tools@v5.5.3
+            - uses: buildpacks/github-actions/setup-tools@v5.7.2
               with:
-                crane-version: 0.19.0
+                crane-version: 0.19.1
                 yj-version: 5.1.0
             - uses: actions/checkout@v4
             - id: dependency
@@ -99,4 +99,4 @@ jobs:
                 labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
                 signoff: true
                 title: Bump Tomcat 9 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-tomcat-access-logging-support.yml b/.github/workflows/pb-update-tomcat-access-logging-support.yml
@@ -11,17 +11,17 @@ jobs:
         steps:
             - uses: actions/setup-go@v5
               with:
-                go-version: "1.22.5"
+                go-version: "1.22"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
-            - uses: buildpacks/github-actions/setup-tools@v5.5.3
+            - uses: buildpacks/github-actions/setup-tools@v5.7.2
               with:
-                crane-version: 0.19.0
+                crane-version: 0.19.1
                 yj-version: 5.1.0
             - uses: actions/checkout@v4
             - id: dependency
@@ -103,4 +103,4 @@ jobs:
                 labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
                 signoff: true
                 title: Bump tomcat-access-logging-support from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/pb-update-tomcat-lifecycle-support.yml b/.github/workflows/pb-update-tomcat-lifecycle-support.yml
@@ -11,17 +11,17 @@ jobs:
         steps:
             - uses: actions/setup-go@v5
               with:
-                go-version: "1.22.5"
+                go-version: "1.22"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest
-            - uses: buildpacks/github-actions/setup-tools@v5.5.3
+            - uses: buildpacks/github-actions/setup-tools@v5.7.2
               with:
-                crane-version: 0.19.0
+                crane-version: 0.19.1
                 yj-version: 5.1.0
             - uses: actions/checkout@v4
             - id: dependency
@@ -103,4 +103,4 @@ jobs:
                 labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade
                 signoff: true
                 title: Bump tomcat-lifecycle-support from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
-                token: ${{ secrets.PAT }}
+                token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}