From 649cc6e3fdf99bb01c93c80c218195849535b74c Mon Sep 17 00:00:00 2001 From: Jon Cowie Date: Fri, 25 May 2018 12:06:26 -0500 Subject: [PATCH 1/3] Fix hab plan to use correct gemspec name Signed-off-by: Jon Cowie --- habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitat/plan.sh b/habitat/plan.sh index 2aa423123..bb0b51abf 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -40,7 +40,7 @@ do_before() { do_download() { # Instead of downloading, build a gem based on the source in src/ cd $PLAN_CONTEXT/.. - gem build $pkg_name.gemspec + gem build chef-dk.gemspec } do_verify() { From d52852d58b76588c1fb5222dcbb4426a1c8b1ec0 Mon Sep 17 00:00:00 2001 From: Jon Cowie Date: Fri, 25 May 2018 12:12:11 -0500 Subject: [PATCH 2/3] Correct gem name too Signed-off-by: Jon Cowie --- habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitat/plan.sh b/habitat/plan.sh index bb0b51abf..6683342d6 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -50,7 +50,7 @@ do_verify() { do_unpack() { # Unpack the gem we built to the source cache path. Building then unpacking # the gem reuses the file inclusion/exclusion rules defined in the gemspec. - gem unpack $PLAN_CONTEXT/../$pkg_name-$pkg_version.gem --target=$HAB_CACHE_SRC_PATH + gem unpack $PLAN_CONTEXT/../chef-dk-$pkg_version.gem --target=$HAB_CACHE_SRC_PATH } do_prepare() { From 8ed5e5214ee96cea6fdd5db4ce50531447f4e261 Mon Sep 17 00:00:00 2001 From: Jon Cowie Date: Fri, 25 May 2018 12:14:22 -0500 Subject: [PATCH 3/3] Fix properly to use chef-dk name for habitat package Signed-off-by: Jon Cowie --- .expeditor/config.yml | 2 +- habitat/plan.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 7b660d0c3..6ca0ff2a7 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -16,7 +16,7 @@ docker_images: - chefdk habitat_packages: - - chefdk + - chef-dk github: # The file where the MAJOR.MINOR.PATCH version is kept. The version in this file diff --git a/habitat/plan.sh b/habitat/plan.sh index 6683342d6..f29779a3d 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -1,4 +1,4 @@ -pkg_name=chefdk +pkg_name=chef-dk pkg_origin=chef pkg_maintainer="The Chef Maintainers " pkg_description="The Chef Developer Kit" @@ -40,7 +40,7 @@ do_before() { do_download() { # Instead of downloading, build a gem based on the source in src/ cd $PLAN_CONTEXT/.. - gem build chef-dk.gemspec + gem build $pkg_name.gemspec } do_verify() { @@ -50,7 +50,7 @@ do_verify() { do_unpack() { # Unpack the gem we built to the source cache path. Building then unpacking # the gem reuses the file inclusion/exclusion rules defined in the gemspec. - gem unpack $PLAN_CONTEXT/../chef-dk-$pkg_version.gem --target=$HAB_CACHE_SRC_PATH + gem unpack $PLAN_CONTEXT/../$pkg_name-$pkg_version.gem --target=$HAB_CACHE_SRC_PATH } do_prepare() {