From 1b649928240caa74bc3e26fa12990031e76c60a0 Mon Sep 17 00:00:00 2001 From: Forest Eckhardt Date: Wed, 15 Jan 2020 10:46:06 -0500 Subject: [PATCH] Append .tgz extension onto packaged buildpacks [#170504759] --- integration/init_test.go | 5 +++++ scripts/package.sh | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/integration/init_test.go b/integration/init_test.go index 100e136e..e96bf38b 100644 --- a/integration/init_test.go +++ b/integration/init_test.go @@ -2,6 +2,7 @@ package integration import ( "errors" + "fmt" "reflect" "strings" "testing" @@ -34,6 +35,10 @@ func TestIntegration(t *testing.T) { offlineNodeBuildpack, _, err = dagger.PackageCachedBuildpack(root) Expect(err).NotTo(HaveOccurred()) + // HACK: we need to fix dagger and the package.sh scripts so that this isn't required + nodeBuildpack = fmt.Sprintf("%s.tgz", nodeBuildpack) + offlineNodeBuildpack = fmt.Sprintf("%s.tgz", offlineNodeBuildpack) + defer func() { dagger.DeleteBuildpack(nodeBuildpack) dagger.DeleteBuildpack(offlineNodeBuildpack) diff --git a/scripts/package.sh b/scripts/package.sh index 1598b834..92d56948 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -26,6 +26,10 @@ if [[ -n "${offline}" ]]; then extra_args+="--offline" fi +if [[ "${PACKAGE_DIR}" != "*.tgz" ]]; then + PACKAGE_DIR="${PACKAGE_DIR}.tgz" +fi + .bin/jam pack \ --buildpack "$(pwd)/buildpack.toml" \ --version "${version}" \