diff --git a/.github/pipeline-version b/.github/pipeline-version index 092afa1..84cc529 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.17.0 +1.18.0 diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml index 4cfe25a..7dd6db4 100644 --- a/.github/workflows/create-package.yml +++ b/.github/workflows/create-package.yml @@ -118,21 +118,25 @@ jobs: if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then create-package \ + --source ${SOURCE_PATH:-.} \ --cache-location "${HOME}"/carton-cache \ --destination "${HOME}"/buildpack \ --include-dependencies \ --version "${VERSION}" else create-package \ + --source ${SOURCE_PATH:-.} \ --destination "${HOME}"/buildpack \ --version "${VERSION}" fi - [[ -e package.toml ]] && cp package.toml "${HOME}"/package.toml + 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 env: INCLUDE_DEPENDENCIES: "false" OS: linux + SOURCE_PATH: "" VERSION: ${{ steps.version.outputs.version }} - name: Package Buildpack id: package @@ -141,13 +145,13 @@ jobs: set -euo pipefail - if [[ -n "${PUBLISH+x}" ]]; then + if [[ "${PUBLISH:-x}" == "true" ]]; then pack buildpack package \ "${PACKAGE}:${VERSION}" \ --config "${HOME}"/package.toml \ --publish - if [ ! -z ${VERSION_MINOR} ] && [ ! -z ${VERSION_MAJOR} ]; then + if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then crane tag "${PACKAGE}:${VERSION}" "${VERSION_MINOR}" crane tag "${PACKAGE}:${VERSION}" "${VERSION_MAJOR}" fi diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b6d092a..7e8fdd6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -92,17 +92,20 @@ jobs: if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then create-package \ + --source ${SOURCE_PATH:-.} \ --cache-location "${HOME}"/carton-cache \ --destination "${HOME}"/buildpack \ --include-dependencies \ --version "${VERSION}" else create-package \ + --source ${SOURCE_PATH:-.} \ --destination "${HOME}"/buildpack \ --version "${VERSION}" fi - [[ -e package.toml ]] && cp package.toml "${HOME}"/package.toml + 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 env: INCLUDE_DEPENDENCIES: "true" @@ -114,13 +117,13 @@ jobs: set -euo pipefail - if [[ -n "${PUBLISH+x}" ]]; then + if [[ "${PUBLISH:-x}" == "true" ]]; then pack buildpack package \ "${PACKAGE}:${VERSION}" \ --config "${HOME}"/package.toml \ --publish - if [ ! -z ${VERSION_MINOR} ] && [ ! -z ${VERSION_MAJOR} ]; then + if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then crane tag "${PACKAGE}:${VERSION}" "${VERSION_MINOR}" crane tag "${PACKAGE}:${VERSION}" "${VERSION_MAJOR}" fi