Merge branch 'main' into update/go

paketo-buildpacks · Apr 10, 2023 · 3cc2fee · 3cc2fee
2 parents f8006a0 + 3e07671
commit 3cc2fee
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 27 deletions.
diff --git a/.github/pipeline-version b/.github/pipeline-version
@@ -1 +1 @@
-1.31.0
+1.32.0
diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml
@@ -25,7 +25,7 @@ jobs:
                 username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install create-package
               run: |
                 #!/usr/bin/env bash
@@ -70,7 +70,7 @@ jobs:
                   "https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \
                 | tar -C "${HOME}"/bin -xz pack
               env:
-                PACK_VERSION: 0.27.0
+                PACK_VERSION: 0.29.0
             - name: Enable pack Experimental
               if: ${{ false }}
               run: |
@@ -128,6 +128,13 @@ jobs:
 
                 set -euo pipefail
 
+                # With Go 1.20, we need to set this so that we produce statically compiled binaries
+                #
+                # Starting with Go 1.20, Go will produce binaries that are dynamically linked against libc
+                #   which can cause compatibility issues. The compiler links against libc on the build system
+                #   but that may be newer than on the stacks we support.
+                export CGO_ENABLED=0
+
                 if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then
                   create-package \
                     --source ${SOURCE_PATH:-.} \

diff --git a/.github/workflows/pb-minimal-labels.yml b/.github/workflows/pb-minimal-labels.yml
@@ -12,7 +12,7 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - uses: mheap/github-action-required-labels@v3
+            - uses: mheap/github-action-required-labels@v4
               with:
                 count: 1
                 labels: semver:major, semver:minor, semver:patch
@@ -22,7 +22,7 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - uses: mheap/github-action-required-labels@v3
+            - uses: mheap/github-action-required-labels@v4
               with:
                 count: 1
                 labels: type:bug, type:dependency-upgrade, type:documentation, type:enhancement, type:question, type:task

diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml
@@ -17,7 +17,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install create-package
               run: |
                 #!/usr/bin/env bash
@@ -43,7 +43,7 @@ jobs:
                   "https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \
                 | tar -C "${HOME}"/bin -xz pack
               env:
-                PACK_VERSION: 0.27.0
+                PACK_VERSION: 0.29.0
             - name: Enable pack Experimental
               if: ${{ false }}
               run: |
@@ -100,6 +100,13 @@ jobs:
 
                 set -euo pipefail
 
+                # With Go 1.20, we need to set this so that we produce statically compiled binaries
+                #
+                # Starting with Go 1.20, Go will produce binaries that are dynamically linked against libc
+                #   which can cause compatibility issues. The compiler links against libc on the build system
+                #   but that may be newer than on the stacks we support.
+                export CGO_ENABLED=0
+
                 if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then
                   create-package \
                     --source ${SOURCE_PATH:-.} \
@@ -181,7 +188,7 @@ jobs:
                 restore-keys: ${{ runner.os }}-go-
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install richgo
               run: |
                 #!/usr/bin/env bash

diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - uses: actions/checkout@v3
             - name: Update Go Version & Modules
               id: update-go
@@ -49,8 +49,8 @@ jobs:
                 echo "commit-body=${COMMIT_BODY}" >> "$GITHUB_OUTPUT"
                 echo "commit-semver=${COMMIT_SEMVER}" >> "$GITHUB_OUTPUT"
               env:
-                GO_VERSION: "1.18"
-            - uses: peter-evans/create-pull-request@v4
+                GO_VERSION: "1.20"
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: |-

diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml
@@ -16,7 +16,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install octo
               run: |
                 #!/usr/bin/env bash
@@ -65,7 +65,7 @@ jobs:
               env:
                 DESCRIPTOR: .github/pipeline-descriptor.yml
                 GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: |-

diff --git a/.github/workflows/pb-update-tomcat-10-1.yml b/.github/workflows/pb-update-tomcat-10-1.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
@@ -95,7 +95,7 @@ jobs:
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
                 VERSION_PATTERN: 10\.1\.[\d]+
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: Bumps `Tomcat 10.1` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.

diff --git a/.github/workflows/pb-update-tomcat-10.yml b/.github/workflows/pb-update-tomcat-10.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
@@ -95,7 +95,7 @@ jobs:
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
                 VERSION_PATTERN: 10\.0\.[\d]+
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: Bumps `Tomcat 10` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.

diff --git a/.github/workflows/pb-update-tomcat-8.yml b/.github/workflows/pb-update-tomcat-8.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
@@ -94,7 +94,7 @@ jobs:
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
                 VERSION_PATTERN: 8\.[\d]+\.[\d]+
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: Bumps `Tomcat 8` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.

diff --git a/.github/workflows/pb-update-tomcat-9.yml b/.github/workflows/pb-update-tomcat-9.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
@@ -94,7 +94,7 @@ jobs:
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
                 VERSION_PATTERN: 9\.[\d]+\.[\d]+
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: Bumps `Tomcat 9` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.

diff --git a/.github/workflows/pb-update-tomcat-access-logging-support.yml b/.github/workflows/pb-update-tomcat-access-logging-support.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
@@ -97,7 +97,7 @@ jobs:
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
                 VERSION_PATTERN: '[\d]+\.[\d]+\.[\d]+'
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: Bumps `tomcat-access-logging-support` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.

diff --git a/.github/workflows/pb-update-tomcat-lifecycle-support.yml b/.github/workflows/pb-update-tomcat-lifecycle-support.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
@@ -97,7 +97,7 @@ jobs:
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
                 VERSION_PATTERN: '[\d]+\.[\d]+\.[\d]+'
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: Bumps `tomcat-lifecycle-support` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.

diff --git a/.github/workflows/pb-update-tomcat-logging-support.yml b/.github/workflows/pb-update-tomcat-logging-support.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - uses: actions/setup-go@v4
               with:
-                go-version: "1.18"
+                go-version: "1.20"
             - name: Install update-buildpack-dependency
               run: |
                 #!/usr/bin/env bash
@@ -97,7 +97,7 @@ jobs:
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
                 VERSION_PATTERN: '[\d]+\.[\d]+\.[\d]+'
-            - uses: peter-evans/create-pull-request@v4
+            - uses: peter-evans/create-pull-request@v5
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
                 body: Bumps `tomcat-logging-support` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.