Skip to content

Commit

Permalink
fix release pipeline
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Wrock <[email protected]>
  • Loading branch information
mwrock committed Oct 10, 2024
1 parent 3baf903 commit 737caad
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .expeditor/release_habitat.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ expeditor:
HAB_ORIGIN: "core"
PIPELINE_HAB_BLDR_URL: "https://bldr.habitat.sh"
# Necessary to prevent old studios from poisoning builds after core plans refreshes
HAB_STUDIO_SECRET_HAB_PREFER_LOCAL_CHEF_DEPS: "true"
HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "LTS-2024"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
HAB_STUDIO_SECRET_HAB_FEAT_IGNORE_LOCAL: "true"

steps:
#######################################################################
Expand Down
4 changes: 3 additions & 1 deletion .expeditor/scripts/release_habitat/build_component.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $Env:HAB_ORIGIN = "core"

# Run a build!
Write-Host "--- Running hab pkg build for $Component"

git config --global --add safe.directory C:/workdir
# Note: HAB_BLDR_CHANNEL *must* be set for the following `hab pkg
# build` command! There isn't currently a CLI option to set that, and
# we must ensure that we're pulling dependencies from our build
Expand All @@ -57,6 +57,8 @@ Invoke-Expression "$baseHabExe pkg build components\$Component --keys core"

Write-Host "--- Running hab pkg upload for $Component to channel $Channel"
Invoke-Expression "$baseHabExe pkg upload results\$pkg_artifact --channel=$Channel --no-build"
if ($LASTEXITCODE -ne 0) {exit $LASTEXITCODE}

Set-TargetMetadata $pkg_ident

Invoke-Expression "buildkite-agent annotate --append --context 'release-manifest' '<br>* ${pkg_ident} (x86_64-windows)'"
Expand Down
3 changes: 3 additions & 0 deletions components/launcher/habitat/plan.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ function Invoke-Prepare {

function pkg_version {
git rev-list (git rev-parse HEAD) --count
if($LASTEXITCODE -ne 0) {
Write-Error "Unable to deterine version from git!"
}
}

function Invoke-Before {
Expand Down

0 comments on commit 737caad

Please sign in to comment.