wip 1719932743

Signed-off-by: Jason Heath <jason.heath@progress.com>
habitat-sh · Jul 2, 2024 · b0317ac · b0317ac
1 parent 35a2c7f
commit b0317ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/actions/hab-pkg-build-and-upload-linux/action.yaml b/.github/actions/hab-pkg-build-and-upload-linux/action.yaml
@@ -36,16 +36,16 @@ runs:
         sudo hab pkg install --auth $HAB_AUTH_TOKEN results/$pkg_artifact
         echo ---- installed succesfully
 
-        echo ---- BEGIN hab pkg path EXPERIMENTS
-        echo ---- hab pkg path $pkg_origin/$pkg_name
-                  hab pkg path $pkg_origin/$pkg_name
-        echo ---- hab pkg path $pkg_origin/$pkg_name/$pkg_version
-                  hab pkg path $pkg_origin/$pkg_name/$pkg_version
-        echo ---- hab pkg path $pkg_origin/$pkg_name/$pkg_version/$pkg_release
-                  hab pkg path $pkg_origin/$pkg_name/$pkg_version/$pkg_release
-        echo ---- hab pkg path $pkg_artifact
-                  hab pkg path $pkg_artifact
-        echo ---- END hab pkg path EXPERIMENTS
+        # echo ---- BEGIN hab pkg path EXPERIMENTS
+        # echo ---- hab pkg path $pkg_origin/$pkg_name
+        #           hab pkg path $pkg_origin/$pkg_name
+        # echo ---- hab pkg path $pkg_origin/$pkg_name/$pkg_version
+        #           hab pkg path $pkg_origin/$pkg_name/$pkg_version
+        # echo ---- hab pkg path $pkg_origin/$pkg_name/$pkg_version/$pkg_release
+        #           hab pkg path $pkg_origin/$pkg_name/$pkg_version/$pkg_release
+        # echo ---- hab pkg path $pkg_artifact
+        #           hab pkg path $pkg_artifact
+        # echo ---- END hab pkg path EXPERIMENTS
 
         echo ---- hab pkg upload --auth elided-HAB_AUTH_TOKEN results/$pkg_artifact
         hab pkg upload --auth $HAB_AUTH_TOKEN results/$pkg_artifact

diff --git a/support/ci/builder-dev-plan.sh b/support/ci/builder-dev-plan.sh
@@ -25,8 +25,8 @@ do_prepare() {
 # shellcheck disable=2154
 do_builder_install() {
   local pkg_path
-  pkg_path=$(hab pkg path jasonheath/"$pkg_name")
-  # JAH: change the jasonheath/ above back to habitat/
+  pkg_path=$(hab pkg path "$pkg_origin"/"$pkg_name")
+  # JAH: change the above back to habitat/"$pkg_name" as it was before?
 
   build_line "Linking new binary into package"
   ln -sfv "$CARGO_TARGET_DIR/$rustc_target/${builder_build_type#--}/$bin" \