Skip to content

Commit

Permalink
remoed the release branch changes and fixing pipeline
Browse files Browse the repository at this point in the history
Signed-off-by: nikhil2611 <[email protected]>
  • Loading branch information
nikhil2611 committed Jan 22, 2025
1 parent 67dd740 commit 44c84ea
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 22 deletions.
3 changes: 3 additions & 0 deletions .expeditor/build.habitat.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
env:
HAB_REFRESH_CHANNEL: "LTS-2024"

origin: chef

expeditor:
Expand Down
1 change: 0 additions & 1 deletion .expeditor/buildkite/artifact.habitat.test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# TODO: Set-StrictMode -Version Latest
$PSDefaultParameterValues['*:ErrorAction']='Stop'
$ErrorActionPreference = 'Stop'
$env:HAB_BLDR_CHANNEL = "LTS-2024"
$env:HAB_ORIGIN = 'ci'
$env:CHEF_LICENSE = 'accept-no-persist'
$env:HAB_LICENSE = 'accept-no-persist'
Expand Down
1 change: 0 additions & 1 deletion .expeditor/buildkite/artifact.habitat.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export HAB_ORIGIN='ci'
export PLAN='berkshelf'
export CHEF_LICENSE="accept-no-persist"
export HAB_LICENSE="accept-no-persist"
export HAB_BLDR_CHANNEL="LTS-2024"

echo "--- checking if git is installed"
if ! command -v git &> /dev/null; then
Expand Down
23 changes: 7 additions & 16 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@ github:
- "Expeditor: Bump Version Major"

release_branches:
- workstation-LTS:
version_constraint: 9.*
- main:
version_constraint: 8.*

artifact_channels:
- dev
- workstation-build
- LTS-2024
- unstable
- chef-dke-lts2024

changelog:
rollup_header: Changes not yet released to rubygems.org
Expand Down Expand Up @@ -62,11 +59,8 @@ subscriptions:
ignore_labels:
- "Expeditor: Skip Changelog"
- "Expeditor: Skip All"
- trigger_pipeline:habitat/test:
- built_in:build_gem:
only_if: built_in:bump_version
ignore_labels:
- "Expeditor: Skip Habitat"
- "Expeditor: Skip All"
- trigger_pipeline:habitat/build:
only_if: built_in:bump_version
ignore_labels:
Expand All @@ -79,12 +73,9 @@ subscriptions:
# when all of the hab package publish to the unstable channel, test and promote them
- built_in:promote_habitat_packages

# Subscribe to the promotion of the dev channel to acceptance
- workload: project_promoted:{{agent_id}}:dev:*
actions:
- built_in:promote_habitat_packages
- workload: project_promoted:{{agent_id}}:workstation-build:*
# Subscribe to the promotion of the unstable channel to stable
- workload: project_promoted:{{agent_id}}:chef-dke-lts2024:*
actions:
- built_in:promote_habitat_packages
# - built_in:rollover_changelog
# - built_in:publish_rubygems
- built_in:rollover_changelog
- built_in:publish_rubygems
2 changes: 2 additions & 0 deletions .expeditor/habitat-test.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ expeditor:
defaults:
buildkite:
timeout_in_minutes: 30
env:
HAB_REFRESH_CHANNEL: "LTS-2024"
retry:
automatic:
limit: 1
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.0
8.0.16
1 change: 0 additions & 1 deletion habitat/plan.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$ErrorActionPreference = "Stop"
$PSDefaultParameterValues['*:ErrorAction']='Stop'

$env:HAB_REFRESH_CHANNEL = "LTS-2024"
$pkg_name="berkshelf"
$pkg_origin="chef"
$pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")
Expand Down
1 change: 0 additions & 1 deletion habitat/plan.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export HAB_REFRESH_CHANNEL="LTS-2024"
pkg_name="berkshelf"
pkg_origin="chef"
ruby_pkg="core/ruby3_1"
Expand Down
2 changes: 1 addition & 1 deletion lib/berkshelf/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Berkshelf
VERSION = "9.0.0".freeze
VERSION = "8.0.16".freeze
end

0 comments on commit 44c84ea

Please sign in to comment.