From c3301e5a78380667cb0a4b3bba3c8c245c26089b Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Thu, 16 May 2024 05:12:00 +0000 Subject: [PATCH] Bump pipeline from 1.37.5 to 1.38.0 Bumps pipeline from 1.37.5 to 1.38.0. Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/pipeline-version | 2 +- .github/workflows/pb-create-package.yml | 2 +- .github/workflows/pb-tests.yml | 2 +- .gitignore | 2 ++ scripts/build.sh | 16 +++++++++------- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/pipeline-version b/.github/pipeline-version index e2ba070..ebeef2f 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.37.5 +1.38.0 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index c0216ae..5cea42b 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -188,7 +188,7 @@ jobs: else pack -v buildpack package \ "${PACKAGE}:${VERSION}" ${CONFIG} \ - --format "${FORMAT}" + --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") fi env: PACKAGES: docker.io/paketobuildpacks/eclipse-openj9 gcr.io/paketo-buildpacks/eclipse-openj9 diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index ea688a4..d0a9087 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -173,7 +173,7 @@ jobs: else pack -v buildpack package \ "${PACKAGE}:${VERSION}" ${CONFIG} \ - --format "${FORMAT}" + --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") fi env: FORMAT: image diff --git a/.gitignore b/.gitignore index 592c46e..2f65ee4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ # limitations under the License. bin/ +linux/ dependencies/ package/ scratch/ + diff --git a/scripts/build.sh b/scripts/build.sh index b82b390..11e6bd6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,17 +1,19 @@ #!/usr/bin/env bash - set -euo pipefail -GOOS="linux" go build -ldflags='-s -w' -o bin/helper github.com/paketo-buildpacks/libjvm/cmd/helper -GOOS="linux" go build -ldflags='-s -w' -o bin/main github.com/paketo-buildpacks/eclipse-openj9/v9/cmd/main +GOMOD=$(head -1 go.mod | awk '{print $2}') +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 bin/helper bin/main + strip linux/amd64/bin/main linux/arm64/bin/main fi if [ "${COMPRESS:-none}" != "none" ]; then - $COMPRESS bin/helper bin/main + $COMPRESS linux/amd64/bin/main linux/arm64/bin/main fi -ln -fs main bin/build -ln -fs main bin/detect +ln -fs main linux/amd64/bin/build +ln -fs main linux/arm64/bin/build +ln -fs main linux/amd64/bin/detect +ln -fs main linux/arm64/bin/detect \ No newline at end of file