From c7bed1c5d8d70e67987f05b163a62cf04f769c8c Mon Sep 17 00:00:00 2001 From: janisar007 Date: Mon, 11 Aug 2025 05:11:39 +0000 Subject: [PATCH] Bump pipeline from 1.41.2 to 1.43.0 Bumps pipeline from 1.41.2 to 1.43.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 | 32 +++++++++++++----------- .github/workflows/pb-tests.yml | 28 +++++++++++---------- .github/workflows/pb-update-go.yml | 4 +-- .github/workflows/pb-update-pipeline.yml | 2 +- scripts/build.sh | 18 ++++++------- 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/.github/pipeline-version b/.github/pipeline-version index 5f24410..b978278 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.41.2 +1.43.0 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index a5116a3..5320f54 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -18,7 +18,7 @@ jobs: username: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_USERNAME }} - uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - name: Install create-package run: | #!/usr/bin/env bash @@ -26,24 +26,21 @@ 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.7.2 + - uses: buildpacks/github-actions/setup-tools@v5.8.9 with: - crane-version: 0.19.1 + crane-version: 0.20.3 yj-version: 5.1.0 - - uses: buildpacks/github-actions/setup-pack@v5.7.2 + - uses: buildpacks/github-actions/setup-pack@v5.8.9 with: - pack-version: 0.36.0 + pack-version: 0.36.4 - name: Enable pack Experimental - if: ${{ false }} run: | #!/usr/bin/env bash set -euo pipefail echo "Enabling pack experimental features" - - mkdir -p "${HOME}"/.pack - echo "experimental = true" >> "${HOME}"/.pack/config.toml + pack config experimental true - uses: actions/checkout@v4 - if: ${{ false }} uses: actions/cache@v4 @@ -135,7 +132,7 @@ jobs: cd "${COMPILED_BUILDPACK}" CONFIG="" if [ -f "${COMPILED_BUILDPACK}/package.toml" ]; then - CONFIG="--config ${COMPILED_BUILDPACK}/package.toml" + CONFIG="--config ${COMPILED_BUILDPACK}/package.toml --flatten" fi PACKAGE_LIST=($PACKAGES) @@ -166,11 +163,16 @@ jobs: crane tag "${P}:${VERSION}" latest fi done - else - pack -v buildpack package \ - "${PACKAGE}:${VERSION}" ${CONFIG} \ - --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") + if [ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ]; then + TAG="${PACKAGE}-$(mktemp -u XXXXX | awk '{print tolower($0)}'):${VERSION}" + pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" --publish + else + TAG="${PACKAGE}:${VERSION}" + pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" + fi + + echo "ttl-image-tag=${TAG:-}" >> "$GITHUB_OUTPUT" fi env: PACKAGES: docker.io/initializbuildpacks/procfile @@ -201,7 +203,7 @@ jobs: DIGEST: ${{ steps.package.outputs.digest }} GITHUB_TOKEN: ${{ secrets.PAT }} - if: ${{ true }} - uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.7.2 + uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.8.9 with: address: docker.io/initializbuildpacks/procfile@${{ steps.package.outputs.digest }} id: initializ-buildpacks/procfile diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index 0b58905..51bc1b2 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -24,7 +24,7 @@ jobs: username: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_USERNAME }} - uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - name: Install create-package run: | #!/usr/bin/env bash @@ -32,20 +32,17 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest - - uses: buildpacks/github-actions/setup-pack@v5.7.2 + - uses: buildpacks/github-actions/setup-pack@v5.8.9 with: - pack-version: 0.34.2 + pack-version: 0.36.4 - name: Enable pack Experimental - if: ${{ false }} run: | #!/usr/bin/env bash set -euo pipefail echo "Enabling pack experimental features" - - mkdir -p "${HOME}"/.pack - echo "experimental = true" >> "${HOME}"/.pack/config.toml + pack config experimental true - uses: actions/checkout@v4 - uses: actions/cache@v4 with: @@ -134,7 +131,7 @@ jobs: cd "${COMPILED_BUILDPACK}" CONFIG="" if [ -f "${COMPILED_BUILDPACK}/package.toml" ]; then - CONFIG="--config ${COMPILED_BUILDPACK}/package.toml" + CONFIG="--config ${COMPILED_BUILDPACK}/package.toml --flatten" fi PACKAGE_LIST=($PACKAGES) @@ -165,11 +162,16 @@ jobs: crane tag "${P}:${VERSION}" latest fi done - else - pack -v buildpack package \ - "${PACKAGE}:${VERSION}" ${CONFIG} \ - --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") + if [ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ]; then + TAG="${PACKAGE}-$(mktemp -u XXXXX | awk '{print tolower($0)}'):${VERSION}" + pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" --publish + else + TAG="${PACKAGE}:${VERSION}" + pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" + fi + + echo "ttl-image-tag=${TAG:-}" >> "$GITHUB_OUTPUT" fi env: FORMAT: image @@ -189,7 +191,7 @@ jobs: restore-keys: ${{ runner.os }}-go- - uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - 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 310d2c9..339b32e 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.23" + go-version: "1.24" - 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.23" + GO_VERSION: "1.24" - 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-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index 4f592e4..ddbca8e 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.23" + go-version: "1.24" - name: Install octo run: | #!/usr/bin/env bash diff --git a/scripts/build.sh b/scripts/build.sh index 447e20f..11e6bd6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash - set -euo pipefail -GOOS="linux" go build -ldflags='-s -w' -o bin/main github.com/initializ-buildpacks/procfile/v5/cmd/main -GOOS="windows" GOARCH="amd64" go build -ldflags='-s -w' -o bin/main.exe github.com/initializ-buildpacks/procfile/v5/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/main bin/main.exe + strip linux/amd64/bin/main linux/arm64/bin/main fi if [ "${COMPRESS:-none}" != "none" ]; then - $COMPRESS bin/main bin/main.exe + $COMPRESS linux/amd64/bin/main linux/arm64/bin/main fi -ln -fs main bin/build -ln -fs main bin/detect -ln -fs main.exe bin/build.exe -ln -fs main.exe bin/detect.exe +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