From 66274bf5e4e9afbb16d6f30cb8ab4fbbba121e9c Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Wed, 27 Mar 2024 05:08:35 +0000 Subject: [PATCH 1/2] Bump pipeline from 1.36.6 to 1.37.2 Bumps pipeline from 1.36.6 to 1.37.2. Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/pipeline-version | 2 +- .github/workflows/pb-create-package.yml | 35 +++++++++++++++++------- .github/workflows/pb-tests.yml | 33 ++++++++++++++++------ .github/workflows/pb-update-pipeline.yml | 3 ++ .gitignore | 20 ++++++++++++++ 5 files changed, 73 insertions(+), 20 deletions(-) create mode 100755 .gitignore diff --git a/.github/pipeline-version b/.github/pipeline-version index f5b8b23..bbb542a 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.36.6 +1.37.2 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index 216a994..e61332c 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -37,9 +37,20 @@ jobs: with: crane-version: 0.19.0 yj-version: 5.1.0 - - uses: buildpacks/github-actions/setup-pack@v5.5.3 - with: - pack-version: 0.33.2 + - 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 - name: Enable pack Experimental if: ${{ false }} run: | @@ -133,15 +144,20 @@ jobs: set -euo pipefail + CONFIG="--config "${HOME}"/package.toml" + #TODO with this, we don't need to use the package.toml, because pack exp. does not support it with multi arch yet + if ! [ -f "${PWD}/package.toml" ]; then + cd ~/buildpack + CONFIG="" + fi PACKAGE_LIST=($PACKAGES) # Extract first repo (Docker Hub) as the main to package & register PACKAGE=${PACKAGE_LIST[0]} if [[ "${PUBLISH:-x}" == "true" ]]; then - pack buildpack package \ - "${PACKAGE}:${VERSION}" \ - --config "${HOME}"/package.toml \ + pack -v buildpack package \ + "${PACKAGE}:${VERSION}" ${CONFIG} \ --publish if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then @@ -165,9 +181,8 @@ jobs: done else - pack buildpack package \ - "${PACKAGE}:${VERSION}" \ - --config "${HOME}"/package.toml \ + pack -v buildpack package \ + "${PACKAGE}:${VERSION}" ${CONFIG} \ --format "${FORMAT}" fi env: @@ -199,7 +214,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:4.0.1 + uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.5.3 with: address: docker.io/paketobuildpacks/java-memory-assistant@${{ steps.package.outputs.digest }} id: paketo-buildpacks/java-memory-assistant diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index 6adcf4e..dad2bef 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -25,9 +25,20 @@ 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.5.3 - with: - pack-version: 0.33.2 + - 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 - name: Enable pack Experimental if: ${{ false }} run: | @@ -118,15 +129,20 @@ jobs: set -euo pipefail + CONFIG="--config "${HOME}"/package.toml" + #TODO with this, we don't need to use the package.toml, because pack exp. does not support it with multi arch yet + if ! [ -f "${PWD}/package.toml" ]; then + cd ~/buildpack + CONFIG="" + fi PACKAGE_LIST=($PACKAGES) # Extract first repo (Docker Hub) as the main to package & register PACKAGE=${PACKAGE_LIST[0]} if [[ "${PUBLISH:-x}" == "true" ]]; then - pack buildpack package \ - "${PACKAGE}:${VERSION}" \ - --config "${HOME}"/package.toml \ + pack -v buildpack package \ + "${PACKAGE}:${VERSION}" ${CONFIG} \ --publish if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then @@ -150,9 +166,8 @@ jobs: done else - pack buildpack package \ - "${PACKAGE}:${VERSION}" \ - --config "${HOME}"/package.toml \ + pack -v buildpack package \ + "${PACKAGE}:${VERSION}" ${CONFIG} \ --format "${FORMAT}" fi env: diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index a80569f..acb5ab7 100644 --- a/.github/workflows/pb-update-pipeline.yml +++ b/.github/workflows/pb-update-pipeline.yml @@ -55,6 +55,9 @@ jobs: ) git add .github/ + git add .gitignore + git add scripts/build.sh + git checkout -- . echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..2f65ee4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +# Copyright 2018-2020 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +bin/ +linux/ +dependencies/ +package/ +scratch/ + From 2c493ccd2f9bcf123d8da520e4d509ea24e45be8 Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Sun, 31 Mar 2024 22:28:31 -0400 Subject: [PATCH 2/2] Add missing metadata for dual arch --- .github/pipeline-descriptor.yml | 3 +++ buildpack.toml | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml index f05d92a..3bc6139 100644 --- a/.github/pipeline-descriptor.yml +++ b/.github/pipeline-descriptor.yml @@ -6,6 +6,9 @@ codeowners: - path: "*" owner: "@paketo-buildpacks/java-maintainers" +helpers: + "bin/helper": "$GOMOD/cmd/helper" + package: repositories: ["docker.io/paketobuildpacks/java-memory-assistant","gcr.io/paketo-buildpacks/java-memory-assistant"] register: true diff --git a/buildpack.toml b/buildpack.toml index 673a483..166bb60 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -28,6 +28,7 @@ api = "0.7" uri = "https://github.com/paketo-buildpacks/java-memory-assistant/blob/main/LICENSE" [metadata] + include-files = ["LICENSE", "NOTICE", "README.md", "linux/amd64/bin/build", "linux/amd64/bin/detect", "linux/amd64/bin/main", "linux/amd64/bin/helper", "linux/arm64/bin/build", "linux/arm64/bin/detect", "linux/arm64/bin/main", "linux/arm64/bin/helper", "buildpack.toml"] include-files = ["LICENSE", "NOTICE", "README.md", "bin/build", "bin/detect", "bin/main", "bin/helper", "buildpack.toml"] pre-package = "scripts/build.sh" @@ -73,3 +74,11 @@ api = "0.7" [[stacks]] id = "*" + +[[targets]] +arch = "amd64" +os = "linux" + +[[targets]] +arch = "arm64" +os = "linux" \ No newline at end of file