diff --git a/.github/workflows/push-buildpackage.yml b/.github/workflows/push-buildpackage.yml index 7d21fb4..9e3e71b 100644 --- a/.github/workflows/push-buildpackage.yml +++ b/.github/workflows/push-buildpackage.yml @@ -112,7 +112,7 @@ jobs: password: ${{ env.GCR_PASSWORD }} registry: ${{ env.GCR_REGISTRY }} - - uses: buildpacks/github-actions/setup-tools@v5.10.0 + - uses: buildpacks/github-actions/setup-tools@v5.10.1 - name: Push to DockerHub if: ${{ steps.parse_configs.outputs.push_to_dockerhub == 'true' }} id: push diff --git a/.github/workflows/update-dependencies-from-metadata.yml b/.github/workflows/update-dependencies-from-metadata.yml index 2d4dcba..1202a2e 100644 --- a/.github/workflows/update-dependencies-from-metadata.yml +++ b/.github/workflows/update-dependencies-from-metadata.yml @@ -195,7 +195,7 @@ jobs: uses: actions/checkout@v6 - name: Download artifact files - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v6 with: name: "${{ needs.retrieve.outputs.id }}-${{ matrix.includes.version }}-${{ matrix.includes.os != '' && matrix.includes.os || 'linux' }}-${{ matrix.includes.arch != '' && matrix.includes.arch || 'amd64' }}-${{ matrix.includes.target }}" @@ -229,7 +229,7 @@ jobs: run: echo "checksum=$(cat ${{ steps.get-file-names.outputs.checksum-file }})" >> "$GITHUB_OUTPUT" - name: Download metadata.json - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v6 with: name: metadata.json @@ -299,7 +299,7 @@ jobs: # Metadata file for the non-compiled dependencies, if there are any - name: Download metadata.json file - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v6 with: path: "${{ steps.make-outputdir.outputs.outputdir }}/metadata-files" pattern: "from-source-metadata.json" @@ -309,7 +309,7 @@ jobs: # Download each metadata file, and combine them into one - name: Download individual metadata-file.json file(s) if: ${{ needs.update-metadata.result == 'success' }} - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v6 with: path: "${{ steps.make-outputdir.outputs.outputdir }}/metadata-files" pattern: "*metadata-file.json" diff --git a/scripts/.util/builders.sh b/scripts/.util/builders.sh index b8da8dc..a4b3e9a 100644 --- a/scripts/.util/builders.sh +++ b/scripts/.util/builders.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail diff --git a/scripts/.util/print.sh b/scripts/.util/print.sh index a05b775..0c5a49e 100644 --- a/scripts/.util/print.sh +++ b/scripts/.util/print.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json index d14e8ce..dd4c8ec 100644 --- a/scripts/.util/tools.json +++ b/scripts/.util/tools.json @@ -1,6 +1,6 @@ { "createpackage": "v1.73.0", - "jam": "v2.15.1", + "jam": "v2.15.2", "libpaktools": "v0.3.0", "pack": "v0.39.1" } diff --git a/scripts/.util/tools.sh b/scripts/.util/tools.sh index d9b4a58..2d0c9a2 100644 --- a/scripts/.util/tools.sh +++ b/scripts/.util/tools.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail diff --git a/scripts/build.sh b/scripts/build.sh index 7c7ec2d..11ab80b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail diff --git a/scripts/integration.sh b/scripts/integration.sh index be705e9..3257ad9 100755 --- a/scripts/integration.sh +++ b/scripts/integration.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail @@ -137,6 +134,7 @@ function builder_images::pull() { pack inspect-builder "${builder}" --output json \ | jq -r '.remote_info.run_images[0].name' )" + lifecycle_image="index.docker.io/buildpacksio/lifecycle:$( pack inspect-builder "${builder}" --output json \ | jq -r '.remote_info.lifecycle.version' diff --git a/scripts/package.sh b/scripts/package.sh index 79468de..cb79bfd 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail @@ -158,4 +155,4 @@ function buildpackage::create() { rm -rf ${BUILD_DIR}/cnbdir } -main "${@:-}" +main "${@:-}" \ No newline at end of file diff --git a/scripts/publish.sh b/scripts/publish.sh index 2699f64..6668542 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail diff --git a/scripts/unit.sh b/scripts/unit.sh index 1890e0e..dd130bf 100755 --- a/scripts/unit.sh +++ b/scripts/unit.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 set -eu set -o pipefail