diff --git a/.github/pipeline-version b/.github/pipeline-version index aa3ed3a..eee5909 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.46.1 +1.47.2 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index 9540e68..7a6f8fa 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -11,13 +11,14 @@ jobs: steps: - name: Docker login ghcr.io if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }} - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: password: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} registry: ghcr.io username: ${{ github.actor }} - - uses: actions/setup-go@v6 + - uses: actions/setup-go@v7 with: + cache: false go-version: "1.26" - name: Install create-package run: | @@ -26,13 +27,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.12.0 + - uses: buildpacks/github-actions/setup-tools@v6.0.0 with: - crane-version: 0.20.3 + crane-version: 0.21.7 yj-version: 5.1.0 - - uses: buildpacks/github-actions/setup-pack@v5.12.0 + - uses: buildpacks/github-actions/setup-pack@v6.0.0 with: - pack-version: 0.40.2 + pack-version: 0.40.8 - name: Enable pack Experimental run: | #!/usr/bin/env bash @@ -41,9 +42,9 @@ jobs: echo "Enabling pack experimental features" pack config experimental true - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - if: ${{ false }} - uses: actions/cache@v5 + uses: actions/cache@v6 with: key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }} path: |- @@ -164,7 +165,7 @@ jobs: fi done else - if [ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ]; then + if [ "${REGISTRY_PUBLISH:-}" = "true" ]; then TAG="${PACKAGE}-$(mktemp -u XXXXX | awk '{print tolower($0)}'):${VERSION}" pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" --publish else @@ -172,7 +173,7 @@ jobs: pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" fi - echo "ttl-image-tag=${TAG:-}" >> "$GITHUB_OUTPUT" + echo "image-tag=${TAG:-}" >> "$GITHUB_OUTPUT" fi env: PACKAGES: ghcr.io/amp-buildpacks/forc @@ -203,7 +204,7 @@ jobs: DIGEST: ${{ steps.package.outputs.digest }} GITHUB_TOKEN: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} - if: ${{ false }} - uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.12.0 + uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:6.0.0 with: address: ghcr.io/amp-buildpacks/forc@${{ steps.package.outputs.digest }} id: amp-buildpacks/forc diff --git a/.github/workflows/pb-synchronize-labels.yml b/.github/workflows/pb-synchronize-labels.yml index e5daab9..53d6448 100644 --- a/.github/workflows/pb-synchronize-labels.yml +++ b/.github/workflows/pb-synchronize-labels.yml @@ -11,7 +11,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: micnncim/action-label-syncer@v1 env: GITHUB_TOKEN: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index f0d75ee..b6e45cc 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -17,13 +17,14 @@ jobs: steps: - name: Docker login ghcr.io if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }} - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: password: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} registry: ghcr.io username: ${{ github.actor }} - - uses: actions/setup-go@v6 + - uses: actions/setup-go@v7 with: + cache: false go-version: "1.26" - name: Install create-package run: | @@ -32,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-pack@v5.12.0 + - uses: buildpacks/github-actions/setup-pack@v6.0.0 with: - pack-version: 0.40.2 + pack-version: 0.40.8 - name: Enable pack Experimental run: | #!/usr/bin/env bash @@ -43,8 +44,8 @@ jobs: echo "Enabling pack experimental features" pack config experimental true - - uses: actions/checkout@v6 - - uses: actions/cache@v5 + - uses: actions/checkout@v7 + - uses: actions/cache@v6 with: key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }} path: |- @@ -163,7 +164,7 @@ jobs: fi done else - if [ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ]; then + if [ "${REGISTRY_PUBLISH:-}" = "true" ]; then TAG="${PACKAGE}-$(mktemp -u XXXXX | awk '{print tolower($0)}'):${VERSION}" pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" --publish else @@ -171,25 +172,25 @@ jobs: pack -v buildpack package "${TAG}" ${CONFIG} --format "${FORMAT}" fi - echo "ttl-image-tag=${TAG:-}" >> "$GITHUB_OUTPUT" + echo "image-tag=${TAG:-}" >> "$GITHUB_OUTPUT" fi env: FORMAT: image PACKAGES: test - TTL_SH_PUBLISH: "false" + REGISTRY_PUBLISH: "false" VERSION: ${{ steps.version.outputs.version }} unit: name: Unit Test runs-on: - ubuntu-latest steps: - - uses: actions/checkout@v6 - - uses: actions/cache@v5 + - uses: actions/checkout@v7 + - uses: actions/cache@v6 with: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} path: ${{ env.HOME }}/go/pkg/mod restore-keys: ${{ runner.os }}-go- - - uses: actions/setup-go@v6 + - uses: actions/setup-go@v7 with: go-version: "1.26" - name: Install richgo diff --git a/.github/workflows/pb-update-draft-release.yml b/.github/workflows/pb-update-draft-release.yml index 5f1a854..ee8718d 100644 --- a/.github/workflows/pb-update-draft-release.yml +++ b/.github/workflows/pb-update-draft-release.yml @@ -13,7 +13,7 @@ jobs: uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Update draft release with buildpack information uses: docker://ghcr.io/paketo-buildpacks/actions/draft-release:main with: diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index dfe8ca3..162a482 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -9,10 +9,10 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v6 + - uses: actions/setup-go@v7 with: go-version: "1.26" - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Update Go Version & Modules id: update-go run: | diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index f65ef1b..69c9522 100644 --- a/.github/workflows/pb-update-pipeline.yml +++ b/.github/workflows/pb-update-pipeline.yml @@ -14,7 +14,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v6 + - uses: actions/setup-go@v7 with: go-version: "1.26" - name: Install octo @@ -24,7 +24,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/pipeline-builder/cmd/octo@latest - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Update Pipeline id: pipeline run: | diff --git a/scripts/build.sh b/scripts/build.sh index 11e6bd6..f129018 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,8 +2,8 @@ set -euo pipefail 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" +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/main linux/arm64/bin/main @@ -12,8 +12,7 @@ fi if [ "${COMPRESS:-none}" != "none" ]; then $COMPRESS linux/amd64/bin/main linux/arm64/bin/main fi - 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 +ln -fs main linux/arm64/bin/build +ln -fs main linux/arm64/bin/detect