From 8a609e75c698cd94859f49b03426d133488de17a Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Mon, 26 Aug 2024 05:14:43 +0000 Subject: [PATCH 1/4] Bump pipeline from 1.39.0 to 1.40.0 Bumps pipeline from 1.39.0 to 1.40.0. Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/dependabot.yml | 11 +++ .github/pipeline-version | 2 +- .github/workflows/pb-create-package.yml | 21 ++--- .github/workflows/pb-tests.yml | 77 +++++++++++++------ .github/workflows/pb-update-apache-tomcat.yml | 4 +- .github/workflows/pb-update-apache-tomee.yml | 4 +- .../pb-update-azure-application-insights.yml | 4 +- .../workflows/pb-update-bellsoft-liberica.yml | 4 +- .../workflows/pb-update-ca-certificates.yml | 4 +- .github/workflows/pb-update-clojure-tools.yml | 4 +- .github/workflows/pb-update-datadog.yml | 4 +- .github/workflows/pb-update-dist-zip.yml | 4 +- .../workflows/pb-update-encrypt-at-rest.yml | 4 +- .../pb-update-environment-variables.yml | 4 +- .../workflows/pb-update-executable-jar.yml | 4 +- .github/workflows/pb-update-go.yml | 72 +++++++++++++++++ .../pb-update-google-stackdriver.yml | 4 +- .github/workflows/pb-update-gradle.yml | 4 +- .github/workflows/pb-update-image-labels.yml | 4 +- .github/workflows/pb-update-jattach.yml | 4 +- .../pb-update-java-memory-assistant.yml | 4 +- .github/workflows/pb-update-leiningen.yml | 4 +- .github/workflows/pb-update-liberty.yml | 4 +- .github/workflows/pb-update-maven.yml | 4 +- .github/workflows/pb-update-node-engine.yml | 4 +- .github/workflows/pb-update-procfile.yml | 4 +- .github/workflows/pb-update-sbt.yml | 4 +- .github/workflows/pb-update-spring-boot.yml | 4 +- .github/workflows/pb-update-syft.yml | 4 +- .github/workflows/pb-update-watchexec.yml | 4 +- .github/workflows/pb-update-yarn.yml | 4 +- .gitignore | 3 +- 32 files changed, 196 insertions(+), 94 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/pb-update-go.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..2adccd4b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: gomod + directory: / + schedule: + interval: daily + ignore: + - dependency-name: github.com/onsi/gomega + labels: + - semver:patch + - type:dependency-upgrade diff --git a/.github/pipeline-version b/.github/pipeline-version index 5edffce6..32b7211c 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.39.0 +1.40.0 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index 7b824dfe..a1ab574e 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -33,24 +33,13 @@ 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.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://ent.box.com/shared/static/j4d1bfe9uk1sb0i7zjvci0md9xmy41u4" -o ${HOME}/bin/pack - chmod +x "${HOME}"/bin/pack + - uses: buildpacks/github-actions/setup-pack@v5.7.2 + with: + pack-version: 0.34.2 - name: Enable pack Experimental if: ${{ false }} run: | @@ -219,7 +208,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.6.0 + uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.7.2 with: address: docker.io/paketobuildpacks/java@${{ steps.package.outputs.digest }} id: paketo-buildpacks/java diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index f3a86edd..c574791e 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -25,20 +25,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/setup-pack@v5.7.2 + with: + pack-version: 0.34.2 - name: Enable pack Experimental if: ${{ false }} run: | @@ -177,16 +166,58 @@ jobs: fi env: FORMAT: image - PACKAGES: test - TTL_SH_PUBLISH: "false" - VERSION: ${{ steps.version.outputs.version }} - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'liberica' + PACKAGES: ttl.sh/test-${{ steps.version.outputs.version }} + TTL_SH_PUBLISH: "true" + VERSION: 1h - name: Run Integration Tests - run: "BP_UNDER_TEST=${PACKAGE}:${VERSION} make integration" + run: | + #!/usr/bin/env bash + + set -euo pipefail + + go test ./integration/... -run Integration env: PACKAGE: test VERSION: ${{ steps.version.outputs.version }} + unit: + name: Unit Test + runs-on: + - ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/cache@v4 + with: + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + path: ${{ env.HOME }}/go/pkg/mod + restore-keys: ${{ runner.os }}-go- + - uses: actions/setup-go@v5 + with: + go-version: "1.22" + - name: Install richgo + run: | + #!/usr/bin/env bash + + set -euo pipefail + + echo "Installing richgo ${RICHGO_VERSION}" + + mkdir -p "${HOME}"/bin + echo "${HOME}/bin" >> "${GITHUB_PATH}" + + curl \ + --location \ + --show-error \ + --silent \ + "https://github.com/kyoh86/richgo/releases/download/v${RICHGO_VERSION}/richgo_${RICHGO_VERSION}_linux_amd64.tar.gz" \ + | tar -C "${HOME}"/bin -xz richgo + env: + RICHGO_VERSION: 0.3.10 + - name: Run Tests + run: | + #!/usr/bin/env bash + + set -euo pipefail + + richgo test ./... -run Unit + env: + RICHGO_FORCE_COLOR: "1" diff --git a/.github/workflows/pb-update-apache-tomcat.yml b/.github/workflows/pb-update-apache-tomcat.yml index 1a653040..3d330ee3 100644 --- a/.github/workflows/pb-update-apache-tomcat.yml +++ b/.github/workflows/pb-update-apache-tomcat.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/apache-tomcat`](https://gcr.io/paketo-buildpacks/apache-tomcat) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/apache-tomcat:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/apache-tomcat:${{ steps.package.outputs.new-version }}). - branch: update/package/apache-tomcat + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/apache-tomcat from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-apache-tomee.yml b/.github/workflows/pb-update-apache-tomee.yml index 263d7f61..fff80780 100644 --- a/.github/workflows/pb-update-apache-tomee.yml +++ b/.github/workflows/pb-update-apache-tomee.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/apache-tomee`](https://gcr.io/paketo-buildpacks/apache-tomee) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/apache-tomee:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/apache-tomee:${{ steps.package.outputs.new-version }}). - branch: update/package/apache-tomee + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/apache-tomee from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-azure-application-insights.yml b/.github/workflows/pb-update-azure-application-insights.yml index 3a39070c..c8bad260 100644 --- a/.github/workflows/pb-update-azure-application-insights.yml +++ b/.github/workflows/pb-update-azure-application-insights.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/azure-application-insights`](https://gcr.io/paketo-buildpacks/azure-application-insights) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/azure-application-insights:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/azure-application-insights:${{ steps.package.outputs.new-version }}). - branch: update/package/azure-application-insights + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/azure-application-insights from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-bellsoft-liberica.yml b/.github/workflows/pb-update-bellsoft-liberica.yml index cf27ce63..be213900 100644 --- a/.github/workflows/pb-update-bellsoft-liberica.yml +++ b/.github/workflows/pb-update-bellsoft-liberica.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/bellsoft-liberica`](https://gcr.io/paketo-buildpacks/bellsoft-liberica) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/bellsoft-liberica:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/bellsoft-liberica:${{ steps.package.outputs.new-version }}). - branch: update/package/bellsoft-liberica + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/bellsoft-liberica from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-ca-certificates.yml b/.github/workflows/pb-update-ca-certificates.yml index 7b46feba..f7ac2208 100644 --- a/.github/workflows/pb-update-ca-certificates.yml +++ b/.github/workflows/pb-update-ca-certificates.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/ca-certificates`](https://gcr.io/paketo-buildpacks/ca-certificates) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/ca-certificates:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/ca-certificates:${{ steps.package.outputs.new-version }}). - branch: update/package/ca-certificates + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/ca-certificates from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-clojure-tools.yml b/.github/workflows/pb-update-clojure-tools.yml index 9dc289bb..76377244 100644 --- a/.github/workflows/pb-update-clojure-tools.yml +++ b/.github/workflows/pb-update-clojure-tools.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/clojure-tools`](https://gcr.io/paketo-buildpacks/clojure-tools) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/clojure-tools:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/clojure-tools:${{ steps.package.outputs.new-version }}). - branch: update/package/clojure-tools + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/clojure-tools from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-datadog.yml b/.github/workflows/pb-update-datadog.yml index 7a2673c5..91bb5a1e 100644 --- a/.github/workflows/pb-update-datadog.yml +++ b/.github/workflows/pb-update-datadog.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/datadog`](https://gcr.io/paketo-buildpacks/datadog) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/datadog:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/datadog:${{ steps.package.outputs.new-version }}). - branch: update/package/datadog + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/datadog from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-dist-zip.yml b/.github/workflows/pb-update-dist-zip.yml index 8f6e9c7b..5f16c913 100644 --- a/.github/workflows/pb-update-dist-zip.yml +++ b/.github/workflows/pb-update-dist-zip.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/dist-zip`](https://gcr.io/paketo-buildpacks/dist-zip) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/dist-zip:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/dist-zip:${{ steps.package.outputs.new-version }}). - branch: update/package/dist-zip + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/dist-zip from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-encrypt-at-rest.yml b/.github/workflows/pb-update-encrypt-at-rest.yml index 8ea29fdc..4359ca5f 100644 --- a/.github/workflows/pb-update-encrypt-at-rest.yml +++ b/.github/workflows/pb-update-encrypt-at-rest.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/encrypt-at-rest`](https://gcr.io/paketo-buildpacks/encrypt-at-rest) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/encrypt-at-rest:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/encrypt-at-rest:${{ steps.package.outputs.new-version }}). - branch: update/package/encrypt-at-rest + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/encrypt-at-rest from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-environment-variables.yml b/.github/workflows/pb-update-environment-variables.yml index 6676781e..d64b64ba 100644 --- a/.github/workflows/pb-update-environment-variables.yml +++ b/.github/workflows/pb-update-environment-variables.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/environment-variables`](https://gcr.io/paketo-buildpacks/environment-variables) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/environment-variables:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/environment-variables:${{ steps.package.outputs.new-version }}). - branch: update/package/environment-variables + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/environment-variables from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-executable-jar.yml b/.github/workflows/pb-update-executable-jar.yml index 88b0286e..fc2f58db 100644 --- a/.github/workflows/pb-update-executable-jar.yml +++ b/.github/workflows/pb-update-executable-jar.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/executable-jar`](https://gcr.io/paketo-buildpacks/executable-jar) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/executable-jar:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/executable-jar:${{ steps.package.outputs.new-version }}). - branch: update/package/executable-jar + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/executable-jar from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml new file mode 100644 index 00000000..eb330af2 --- /dev/null +++ b/.github/workflows/pb-update-go.yml @@ -0,0 +1,72 @@ +name: Update Go +"on": + schedule: + - cron: 42 2 * * 1 + workflow_dispatch: {} +jobs: + update: + name: Update Go + runs-on: + - ubuntu-latest + steps: + - uses: actions/setup-go@v5 + with: + go-version: "1.22" + - uses: actions/checkout@v4 + - name: Update Go Version & Modules + id: update-go + run: | + #!/usr/bin/env bash + + set -euo pipefail + + if [ -z "${GO_VERSION:-}" ]; then + echo "No go version set" + exit 1 + fi + + OLD_GO_VERSION=$(grep -P '^go \d\.\d+' go.mod | cut -d ' ' -f 2) + + go mod edit -go="$GO_VERSION" + go mod tidy + go get -u -t ./... + go mod tidy + + git add go.mod go.sum + git checkout -- . + + if [ "$OLD_GO_VERSION" == "$GO_VERSION" ]; then + COMMIT_TITLE="Bump Go Modules" + COMMIT_BODY="Bumps Go modules used by the project. See the commit for details on what modules were updated." + COMMIT_SEMVER="semver:patch" + else + COMMIT_TITLE="Bump Go from ${OLD_GO_VERSION} to ${GO_VERSION}" + COMMIT_BODY="Bumps Go from ${OLD_GO_VERSION} to ${GO_VERSION} and update Go modules used by the project. See the commit for details on what modules were updated." + COMMIT_SEMVER="semver:minor" + fi + + echo "commit-title=${COMMIT_TITLE}" >> "$GITHUB_OUTPUT" + echo "commit-body=${COMMIT_BODY}" >> "$GITHUB_OUTPUT" + echo "commit-semver=${COMMIT_SEMVER}" >> "$GITHUB_OUTPUT" + env: + 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: |- + ${{ steps.update-go.outputs.commit-body }} + +
+ Release Notes + ${{ steps.pipeline.outputs.release-notes }} +
+ branch: update/go + commit-message: |- + ${{ steps.update-go.outputs.commit-title }} + + ${{ steps.update-go.outputs.commit-body }} + delete-branch: true + labels: ${{ steps.update-go.outputs.commit-semver }}, type:task + signoff: true + title: ${{ steps.update-go.outputs.commit-title }} + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-google-stackdriver.yml b/.github/workflows/pb-update-google-stackdriver.yml index 6dc6842d..6a622bc4 100644 --- a/.github/workflows/pb-update-google-stackdriver.yml +++ b/.github/workflows/pb-update-google-stackdriver.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/google-stackdriver`](https://gcr.io/paketo-buildpacks/google-stackdriver) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/google-stackdriver:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/google-stackdriver:${{ steps.package.outputs.new-version }}). - branch: update/package/google-stackdriver + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/google-stackdriver from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-gradle.yml b/.github/workflows/pb-update-gradle.yml index 31072c40..2b125331 100644 --- a/.github/workflows/pb-update-gradle.yml +++ b/.github/workflows/pb-update-gradle.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/gradle`](https://gcr.io/paketo-buildpacks/gradle) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/gradle:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/gradle:${{ steps.package.outputs.new-version }}). - branch: update/package/gradle + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/gradle from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-image-labels.yml b/.github/workflows/pb-update-image-labels.yml index 9b288a2f..af9d4e48 100644 --- a/.github/workflows/pb-update-image-labels.yml +++ b/.github/workflows/pb-update-image-labels.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/image-labels`](https://gcr.io/paketo-buildpacks/image-labels) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/image-labels:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/image-labels:${{ steps.package.outputs.new-version }}). - branch: update/package/image-labels + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/image-labels from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-jattach.yml b/.github/workflows/pb-update-jattach.yml index d2f55f04..4c51a1b6 100644 --- a/.github/workflows/pb-update-jattach.yml +++ b/.github/workflows/pb-update-jattach.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/jattach`](https://gcr.io/paketo-buildpacks/jattach) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/jattach:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/jattach:${{ steps.package.outputs.new-version }}). - branch: update/package/jattach + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/jattach from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-java-memory-assistant.yml b/.github/workflows/pb-update-java-memory-assistant.yml index f31022fb..9787bc0e 100644 --- a/.github/workflows/pb-update-java-memory-assistant.yml +++ b/.github/workflows/pb-update-java-memory-assistant.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/java-memory-assistant`](https://gcr.io/paketo-buildpacks/java-memory-assistant) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/java-memory-assistant:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/java-memory-assistant:${{ steps.package.outputs.new-version }}). - branch: update/package/java-memory-assistant + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/java-memory-assistant from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-leiningen.yml b/.github/workflows/pb-update-leiningen.yml index a713fe63..5351b5ca 100644 --- a/.github/workflows/pb-update-leiningen.yml +++ b/.github/workflows/pb-update-leiningen.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/leiningen`](https://gcr.io/paketo-buildpacks/leiningen) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/leiningen:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/leiningen:${{ steps.package.outputs.new-version }}). - branch: update/package/leiningen + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/leiningen from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-liberty.yml b/.github/workflows/pb-update-liberty.yml index f93b7b15..d93b7927 100644 --- a/.github/workflows/pb-update-liberty.yml +++ b/.github/workflows/pb-update-liberty.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/liberty`](https://gcr.io/paketo-buildpacks/liberty) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/liberty:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/liberty:${{ steps.package.outputs.new-version }}). - branch: update/package/liberty + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/liberty from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-maven.yml b/.github/workflows/pb-update-maven.yml index 594217e3..45532f26 100644 --- a/.github/workflows/pb-update-maven.yml +++ b/.github/workflows/pb-update-maven.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/maven`](https://gcr.io/paketo-buildpacks/maven) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/maven:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/maven:${{ steps.package.outputs.new-version }}). - branch: update/package/maven + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/maven from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-node-engine.yml b/.github/workflows/pb-update-node-engine.yml index d4578223..33b23dd2 100644 --- a/.github/workflows/pb-update-node-engine.yml +++ b/.github/workflows/pb-update-node-engine.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/node-engine`](https://gcr.io/paketo-buildpacks/node-engine) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/node-engine:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/node-engine:${{ steps.package.outputs.new-version }}). - branch: update/package/node-engine + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/node-engine from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-procfile.yml b/.github/workflows/pb-update-procfile.yml index 9fc33698..1a5a94bf 100644 --- a/.github/workflows/pb-update-procfile.yml +++ b/.github/workflows/pb-update-procfile.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/procfile`](https://gcr.io/paketo-buildpacks/procfile) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/procfile:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/procfile:${{ steps.package.outputs.new-version }}). - branch: update/package/procfile + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/procfile from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-sbt.yml b/.github/workflows/pb-update-sbt.yml index a371b86c..7c5fca98 100644 --- a/.github/workflows/pb-update-sbt.yml +++ b/.github/workflows/pb-update-sbt.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/sbt`](https://gcr.io/paketo-buildpacks/sbt) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/sbt:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/sbt:${{ steps.package.outputs.new-version }}). - branch: update/package/sbt + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/sbt from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-spring-boot.yml b/.github/workflows/pb-update-spring-boot.yml index 946b8ccb..2cc27ded 100644 --- a/.github/workflows/pb-update-spring-boot.yml +++ b/.github/workflows/pb-update-spring-boot.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/spring-boot`](https://gcr.io/paketo-buildpacks/spring-boot) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/spring-boot:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/spring-boot:${{ steps.package.outputs.new-version }}). - branch: update/package/spring-boot + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/spring-boot from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-syft.yml b/.github/workflows/pb-update-syft.yml index 4d955645..5bc67f20 100644 --- a/.github/workflows/pb-update-syft.yml +++ b/.github/workflows/pb-update-syft.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/syft`](https://gcr.io/paketo-buildpacks/syft) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/syft:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/syft:${{ steps.package.outputs.new-version }}). - branch: update/package/syft + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/syft from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-watchexec.yml b/.github/workflows/pb-update-watchexec.yml index 8744924d..745078bb 100644 --- a/.github/workflows/pb-update-watchexec.yml +++ b/.github/workflows/pb-update-watchexec.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/watchexec`](https://gcr.io/paketo-buildpacks/watchexec) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/watchexec:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/watchexec:${{ steps.package.outputs.new-version }}). - branch: update/package/watchexec + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/watchexec from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/pb-update-yarn.yml b/.github/workflows/pb-update-yarn.yml index 17a4ab77..36d40977 100644 --- a/.github/workflows/pb-update-yarn.yml +++ b/.github/workflows/pb-update-yarn.yml @@ -33,7 +33,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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 @@ -93,7 +93,7 @@ jobs: with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`gcr.io/paketo-buildpacks/yarn`](https://gcr.io/paketo-buildpacks/yarn) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/yarn:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/yarn:${{ steps.package.outputs.new-version }}). - branch: update/package/yarn + branch: update/packages commit-message: |- Bump gcr.io/paketo-buildpacks/yarn from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.gitignore b/.gitignore index 6e9f2d5e..2f65ee41 100755 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,4 @@ linux/ dependencies/ package/ scratch/ -target -*.cnb + From aadca2ce4fd430fb56f89ba15dcc8fd88fbec655 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Sun, 1 Sep 2024 16:36:02 -0400 Subject: [PATCH 2/4] Use new war example & also precompile old war example Signed-off-by: Daniel Mikusa --- integration/init_test.go | 8 +++++++- integration/tomcat_test.go | 2 +- integration/tomee_test.go | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/integration/init_test.go b/integration/init_test.go index 3a028478..f07b1feb 100644 --- a/integration/init_test.go +++ b/integration/init_test.go @@ -39,12 +39,18 @@ func TestIntegration(t *testing.T) { suite("Tomcat", testTomcat) suite("TomEE", testTomee) - cmd := exec.Command("./mvnw", "-DskipTests=true", "clean", "package") + cmd := exec.Command("./gradlew", "clean", "build", "-x", "test") cmd.Dir, err = filepath.Abs("./samples/java/war/") Expect(err).To(Succeed()) out, err := cmd.CombinedOutput() Expect(err).NotTo(HaveOccurred(), "failed to precompile war package, output:\n%s", out) + cmd = exec.Command("./mvnw", "-DskipTests=true", "clean", "package") + cmd.Dir, err = filepath.Abs("./samples/java/war-spring/") + Expect(err).To(Succeed()) + out, err = cmd.CombinedOutput() + Expect(err).NotTo(HaveOccurred(), "failed to precompile war-spring package, output:\n%s", out) + suite.Run(t) } diff --git a/integration/tomcat_test.go b/integration/tomcat_test.go index 44a4d26e..b0abfae7 100644 --- a/integration/tomcat_test.go +++ b/integration/tomcat_test.go @@ -76,7 +76,7 @@ func testTomcat(t *testing.T, context spec.G, it spec.S) { WithBuilder(builder). WithTrustBuilder(). WithPullPolicy("if-not-present"). - Execute(imageName, "samples/java/war/target/demo-0.0.1-SNAPSHOT.war") + Execute(imageName, "samples/java/war-spring/target/demo-0.0.1-SNAPSHOT.war") Expect(err).ToNot(HaveOccurred()) Expect(buildLogs.String()).ToNot(BeEmpty()) Expect(len(image.Buildpacks)).To(BeNumerically(">", 0)) diff --git a/integration/tomee_test.go b/integration/tomee_test.go index 495f4101..73e9a2b7 100644 --- a/integration/tomee_test.go +++ b/integration/tomee_test.go @@ -47,7 +47,7 @@ func testTomee(t *testing.T, context spec.G, it spec.S) { WithBuilder(builder). WithTrustBuilder(). WithPullPolicy("if-not-present"). - Execute(imageName, "samples/java/war/target/demo-0.0.1-SNAPSHOT.war") + Execute(imageName, "samples/java/war/build/libs/war-0.0.1-SNAPSHOT.war") Expect(err).ToNot(HaveOccurred()) Expect(buildLogs.String()).ToNot(BeEmpty()) Expect(len(image.Buildpacks)).To(BeNumerically(">", 0)) From 1a6218976489d062548c06f3444aaa8637d2ff78 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Sun, 1 Sep 2024 16:52:21 -0400 Subject: [PATCH 3/4] Add customizations that are presently required for this workflow to run Signed-off-by: Daniel Mikusa --- .github/workflows/pb-tests.yml | 60 +++++----------------------------- 1 file changed, 9 insertions(+), 51 deletions(-) diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index c574791e..3f1da149 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -166,58 +166,16 @@ jobs: fi env: FORMAT: image - PACKAGES: ttl.sh/test-${{ steps.version.outputs.version }} - TTL_SH_PUBLISH: "true" - VERSION: 1h + PACKAGES: test + TTL_SH_PUBLISH: "false" + VERSION: ${{ steps.version.outputs.version }} + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'liberica' - name: Run Integration Tests - run: | - #!/usr/bin/env bash - - set -euo pipefail - - go test ./integration/... -run Integration + run: "BP_UNDER_TEST=${PACKAGE}:${VERSION} make integration" env: PACKAGE: test VERSION: ${{ steps.version.outputs.version }} - unit: - name: Unit Test - runs-on: - - ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/cache@v4 - with: - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - path: ${{ env.HOME }}/go/pkg/mod - restore-keys: ${{ runner.os }}-go- - - uses: actions/setup-go@v5 - with: - go-version: "1.22" - - name: Install richgo - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing richgo ${RICHGO_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - "https://github.com/kyoh86/richgo/releases/download/v${RICHGO_VERSION}/richgo_${RICHGO_VERSION}_linux_amd64.tar.gz" \ - | tar -C "${HOME}"/bin -xz richgo - env: - RICHGO_VERSION: 0.3.10 - - name: Run Tests - run: | - #!/usr/bin/env bash - - set -euo pipefail - - richgo test ./... -run Unit - env: - RICHGO_FORCE_COLOR: "1" From ed322ff7312719ef1e61e7c5570fd0241440537f Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Sun, 1 Sep 2024 16:59:12 -0400 Subject: [PATCH 4/4] Set Tomcat to 10.1 and Tomee to 9.0 Signed-off-by: Daniel Mikusa --- integration/tomcat_test.go | 6 ++++-- integration/tomee_test.go | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/integration/tomcat_test.go b/integration/tomcat_test.go index b0abfae7..04ae46d9 100644 --- a/integration/tomcat_test.go +++ b/integration/tomcat_test.go @@ -42,7 +42,8 @@ func testTomcat(t *testing.T, context spec.G, it spec.S) { image, buildLogs, err = pack.WithNoColor().Build. WithBuildpacks(buildPack). WithEnv(map[string]string{ - "BP_ARCH": "amd64", + "BP_ARCH": "amd64", + "BP_TOMCAT_VERSION": "10.1", }). WithBuilder(builder). WithTrustBuilder(). @@ -71,7 +72,8 @@ func testTomcat(t *testing.T, context spec.G, it spec.S) { image, buildLogs, err = pack.WithNoColor().Build. WithBuildpacks(buildPack). WithEnv(map[string]string{ - "BP_ARCH": "amd64", + "BP_ARCH": "amd64", + "BP_TOMCAT_VERSION": "10.1", }). WithBuilder(builder). WithTrustBuilder(). diff --git a/integration/tomee_test.go b/integration/tomee_test.go index 73e9a2b7..284f7538 100644 --- a/integration/tomee_test.go +++ b/integration/tomee_test.go @@ -43,6 +43,7 @@ func testTomee(t *testing.T, context spec.G, it spec.S) { WithEnv(map[string]string{ "BP_ARCH": "amd64", "BP_JAVA_APP_SERVER": "tomee", + "BP_TOMEE_VERSION": "9.0", }). WithBuilder(builder). WithTrustBuilder().