-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1271 from paketo-buildpacks/update/pipeline
Bump pipeline from 1.36.6 to 1.39.0
- Loading branch information
Showing
30 changed files
with
179 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.36.6 | ||
| 1.39.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,21 +25,32 @@ jobs: | |
| username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} | ||
| - uses: actions/setup-go@v5 | ||
| with: | ||
| go-version: "1.20" | ||
| go-version: "1.22" | ||
| - name: Install create-package | ||
| run: | | ||
| #!/usr/bin/env bash | ||
| 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.3 | ||
| - uses: buildpacks/github-actions/setup-tools@v5.6.0 | ||
| with: | ||
| crane-version: 0.19.0 | ||
| crane-version: 0.19.1 | ||
| yj-version: 5.1.0 | ||
| - uses: buildpacks/github-actions/[email protected] | ||
| 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: | | ||
|
|
@@ -106,21 +117,23 @@ jobs: | |
| if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then | ||
| create-package \ | ||
| --source ${SOURCE_PATH:-.} \ | ||
| --source "${SOURCE_PATH:-.}" \ | ||
| --cache-location "${HOME}"/carton-cache \ | ||
| --destination "${HOME}"/buildpack \ | ||
| --include-dependencies \ | ||
| --version "${VERSION}" | ||
| else | ||
| create-package \ | ||
| --source ${SOURCE_PATH:-.} \ | ||
| --source "${SOURCE_PATH:-.}" \ | ||
| --destination "${HOME}"/buildpack \ | ||
| --version "${VERSION}" | ||
| fi | ||
| PACKAGE_FILE=${SOURCE_PATH:-.}/package.toml | ||
| [[ -e ${PACKAGE_FILE} ]] && cp ${PACKAGE_FILE} "${HOME}"/package.toml | ||
| printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}"/buildpack "${OS}" >> "${HOME}"/package.toml | ||
| PACKAGE_FILE="${SOURCE_PATH:-.}/package.toml" | ||
| if [ -f "${PACKAGE_FILE}" ]; then | ||
| cp "${PACKAGE_FILE}" "${HOME}/buildpack/package.toml" | ||
| printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}/buildpack" "${OS}" >> "${HOME}/buildpack/package.toml" | ||
| fi | ||
| env: | ||
| INCLUDE_DEPENDENCIES: "false" | ||
| OS: linux | ||
|
|
@@ -133,15 +146,23 @@ jobs: | |
| set -euo pipefail | ||
| COMPILED_BUILDPACK="${HOME}/buildpack" | ||
| # create-package puts the buildpack here, we need to run from that directory | ||
| # for component buildpacks so that pack doesn't need a package.toml | ||
| cd "${COMPILED_BUILDPACK}" | ||
| CONFIG="" | ||
| if [ -f "${COMPILED_BUILDPACK}/package.toml" ]; then | ||
| CONFIG="--config ${COMPILED_BUILDPACK}/package.toml" | ||
| 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,10 +186,9 @@ jobs: | |
| done | ||
| else | ||
| pack buildpack package \ | ||
| "${PACKAGE}:${VERSION}" \ | ||
| --config "${HOME}"/package.toml \ | ||
| --format "${FORMAT}" | ||
| pack -v buildpack package \ | ||
| "${PACKAGE}:${VERSION}" ${CONFIG} \ | ||
| --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") | ||
| fi | ||
| env: | ||
| PACKAGES: docker.io/paketobuildpacks/java-azure gcr.io/paketo-buildpacks/java-azure | ||
|
|
@@ -199,7 +219,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.6.0 | ||
| with: | ||
| address: docker.io/paketobuildpacks/java-azure@${{ steps.package.outputs.digest }} | ||
| id: paketo-buildpacks/java-azure | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,17 +17,28 @@ jobs: | |
| steps: | ||
| - uses: actions/setup-go@v5 | ||
| with: | ||
| go-version: "1.20" | ||
| go-version: "1.22" | ||
| - name: Install create-package | ||
| run: | | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
| go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest | ||
| - uses: buildpacks/github-actions/[email protected] | ||
| 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: | | ||
|
|
@@ -93,21 +104,23 @@ jobs: | |
| if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then | ||
| create-package \ | ||
| --source ${SOURCE_PATH:-.} \ | ||
| --source "${SOURCE_PATH:-.}" \ | ||
| --cache-location "${HOME}"/carton-cache \ | ||
| --destination "${HOME}"/buildpack \ | ||
| --include-dependencies \ | ||
| --version "${VERSION}" | ||
| else | ||
| create-package \ | ||
| --source ${SOURCE_PATH:-.} \ | ||
| --source "${SOURCE_PATH:-.}" \ | ||
| --destination "${HOME}"/buildpack \ | ||
| --version "${VERSION}" | ||
| fi | ||
| PACKAGE_FILE=${SOURCE_PATH:-.}/package.toml | ||
| [[ -e ${PACKAGE_FILE} ]] && cp ${PACKAGE_FILE} "${HOME}"/package.toml | ||
| printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}"/buildpack "${OS}" >> "${HOME}"/package.toml | ||
| PACKAGE_FILE="${SOURCE_PATH:-.}/package.toml" | ||
| if [ -f "${PACKAGE_FILE}" ]; then | ||
| cp "${PACKAGE_FILE}" "${HOME}/buildpack/package.toml" | ||
| printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}/buildpack" "${OS}" >> "${HOME}/buildpack/package.toml" | ||
| fi | ||
| env: | ||
| INCLUDE_DEPENDENCIES: "true" | ||
| OS: linux | ||
|
|
@@ -118,15 +131,23 @@ jobs: | |
| set -euo pipefail | ||
| COMPILED_BUILDPACK="${HOME}/buildpack" | ||
| # create-package puts the buildpack here, we need to run from that directory | ||
| # for component buildpacks so that pack doesn't need a package.toml | ||
| cd "${COMPILED_BUILDPACK}" | ||
| CONFIG="" | ||
| if [ -f "${COMPILED_BUILDPACK}/package.toml" ]; then | ||
| CONFIG="--config ${COMPILED_BUILDPACK}/package.toml" | ||
| 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,12 +171,12 @@ jobs: | |
| done | ||
| else | ||
| pack buildpack package \ | ||
| "${PACKAGE}:${VERSION}" \ | ||
| --config "${HOME}"/package.toml \ | ||
| --format "${FORMAT}" | ||
| pack -v buildpack package \ | ||
| "${PACKAGE}:${VERSION}" ${CONFIG} \ | ||
| --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish") | ||
| fi | ||
| env: | ||
| FORMAT: image | ||
| PACKAGES: test | ||
| TTL_SH_PUBLISH: "false" | ||
| VERSION: ${{ steps.version.outputs.version }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.