diff --git a/.github/pipeline-version b/.github/pipeline-version index ebeef2f2..5edffce6 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.38.0 +1.39.0 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index 9cfc9bcc..1b1d5b04 100644 --- 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@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install create-package run: | #!/usr/bin/env bash @@ -33,9 +33,9 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest - - uses: buildpacks/github-actions/setup-tools@v5.5.3 + - uses: buildpacks/github-actions/setup-tools@v5.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - name: Install pack run: | @@ -219,7 +219,7 @@ jobs: DIGEST: ${{ steps.package.outputs.digest }} GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - if: ${{ true }} - uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.5.3 + uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.6.0 with: address: docker.io/paketobuildpacks/liberty@${{ steps.package.outputs.digest }} id: paketo-buildpacks/liberty diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index d0a9087a..3f2fddb3 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install create-package run: | #!/usr/bin/env bash @@ -178,6 +178,7 @@ jobs: env: FORMAT: image PACKAGES: test + TTL_SH_PUBLISH: "false" VERSION: ${{ steps.version.outputs.version }} unit: name: Unit Test @@ -192,7 +193,7 @@ jobs: restore-keys: ${{ runner.os }}-go- - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install richgo run: | #!/usr/bin/env bash diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index 1d474e28..5e9cc1bc 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - uses: actions/checkout@v4 - name: Update Go Version & Modules id: update-go @@ -49,7 +49,7 @@ jobs: echo "commit-body=${COMMIT_BODY}" >> "$GITHUB_OUTPUT" echo "commit-semver=${COMMIT_SEMVER}" >> "$GITHUB_OUTPUT" env: - GO_VERSION: "1.20" + 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> diff --git a/.github/workflows/pb-update-open-liberty-runtime-full.yml b/.github/workflows/pb-update-open-liberty-runtime-full.yml index 8257353a..31439bf5 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-full.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-full.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-jakartaee-10.yml b/.github/workflows/pb-update-open-liberty-runtime-jakartaee-10.yml index 6526215c..f0dc7ff5 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-jakartaee-10.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-jakartaee-10.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-javaee-8.yml b/.github/workflows/pb-update-open-liberty-runtime-javaee-8.yml index 9b393fb0..165f4bc5 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-javaee-8.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-javaee-8.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-kernel.yml b/.github/workflows/pb-update-open-liberty-runtime-kernel.yml index 77ed7205..5769081f 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-kernel.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-kernel.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-micro-profile-3.yml b/.github/workflows/pb-update-open-liberty-runtime-micro-profile-3.yml index f28d9793..199d3896 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-micro-profile-3.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-micro-profile-3.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-micro-profile-4.yml b/.github/workflows/pb-update-open-liberty-runtime-micro-profile-4.yml index 6e9cf6ce..35022a22 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-micro-profile-4.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-micro-profile-4.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-micro-profile-6.yml b/.github/workflows/pb-update-open-liberty-runtime-micro-profile-6.yml index 4bb50a43..c9d5526a 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-micro-profile-6.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-micro-profile-6.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-web-profile-10.yml b/.github/workflows/pb-update-open-liberty-runtime-web-profile-10.yml index 84fdb25f..7e6f16a7 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-web-profile-10.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-web-profile-10.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-open-liberty-runtime-web-profile-8.yml b/.github/workflows/pb-update-open-liberty-runtime-web-profile-8.yml index a3d8d444..a4c75315 100644 --- a/.github/workflows/pb-update-open-liberty-runtime-web-profile-8.yml +++ b/.github/workflows/pb-update-open-liberty-runtime-web-profile-8.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index b22b7a32..2c052236 100644 --- a/.github/workflows/pb-update-pipeline.yml +++ b/.github/workflows/pb-update-pipeline.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install octo run: | #!/usr/bin/env bash diff --git a/.github/workflows/pb-update-websphere-liberty-runtime-jakartaee-10.yml b/.github/workflows/pb-update-websphere-liberty-runtime-jakartaee-10.yml index 0383d0fa..8196d704 100644 --- a/.github/workflows/pb-update-websphere-liberty-runtime-jakartaee-10.yml +++ b/.github/workflows/pb-update-websphere-liberty-runtime-jakartaee-10.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-websphere-liberty-runtime-javaee-7.yml b/.github/workflows/pb-update-websphere-liberty-runtime-javaee-7.yml index a5f2d39f..80a65034 100644 --- a/.github/workflows/pb-update-websphere-liberty-runtime-javaee-7.yml +++ b/.github/workflows/pb-update-websphere-liberty-runtime-javaee-7.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-websphere-liberty-runtime-javaee-8.yml b/.github/workflows/pb-update-websphere-liberty-runtime-javaee-8.yml index 9099dd87..f62af7f2 100644 --- a/.github/workflows/pb-update-websphere-liberty-runtime-javaee-8.yml +++ b/.github/workflows/pb-update-websphere-liberty-runtime-javaee-8.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-websphere-liberty-runtime-kernel.yml b/.github/workflows/pb-update-websphere-liberty-runtime-kernel.yml index ce7895fc..5b43670b 100644 --- a/.github/workflows/pb-update-websphere-liberty-runtime-kernel.yml +++ b/.github/workflows/pb-update-websphere-liberty-runtime-kernel.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-10.yml b/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-10.yml index 6ac7f75a..7f47dda1 100644 --- a/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-10.yml +++ b/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-10.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-7.yml b/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-7.yml index 26874d5b..63dc5f64 100644 --- a/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-7.yml +++ b/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-7.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-8.yml b/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-8.yml index daa970a3..379f837a 100644 --- a/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-8.yml +++ b/.github/workflows/pb-update-websphere-liberty-runtime-web-profile-8.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Install update-buildpack-dependency run: | #!/usr/bin/env bash @@ -19,9 +19,9 @@ jobs: 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.6.0 with: - crane-version: 0.19.0 + crane-version: 0.19.1 yj-version: 5.1.0 - uses: actions/checkout@v4 - id: dependency diff --git a/scripts/build.sh b/scripts/build.sh index bdb41001..9b05e983 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,10 +2,10 @@ set -euo pipefail GOMOD=$(head -1 go.mod | awk '{print $2}') -GOOS="linux" GOARCH="amd64" go build -ldflags='-s -w' -tags osusergo -o "linux/amd64/bin/helper" "$GOMOD/cmd/helper" -GOOS="linux" GOARCH="arm64" go build -ldflags='-s -w' -tags osusergo -o "linux/arm64/bin/helper" "$GOMOD/cmd/helper" -GOOS="linux" GOARCH="amd64" go build -ldflags='-s -w' -tags osusergo -o linux/amd64/bin/main "$GOMOD/cmd/main" -GOOS="linux" GOARCH="arm64" go build -ldflags='-s -w' -tags osusergo -o linux/arm64/bin/main "$GOMOD/cmd/main" +GOOS="linux" GOARCH="amd64" go build -ldflags='-s -w' -o "linux/amd64/bin/helper" "$GOMOD/cmd/helper" +GOOS="linux" GOARCH="arm64" go build -ldflags='-s -w' -o "linux/arm64/bin/helper" "$GOMOD/cmd/helper" +GOOS="linux" GOARCH="amd64" go build -ldflags='-s -w' -o linux/amd64/bin/main "$GOMOD/cmd/main" +GOOS="linux" GOARCH="arm64" go build -ldflags='-s -w' -o linux/arm64/bin/main "$GOMOD/cmd/main" if [ "${STRIP:-false}" != "false" ]; then strip linux/amd64/bin/helper linux/arm64/bin/helper