diff --git a/.github/actions/hab-pkg-build-and-upload-linux/action.yaml b/.github/actions/hab-pkg-build-and-upload-linux/action.yaml index 4461ea57e..838c6b307 100644 --- 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 index 3531d160f..f60626a47 100644 --- 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" \