From 5509f3f3ca7fd5b48d729358046e639f84363f44 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 16 Jan 2025 18:49:07 +0530 Subject: [PATCH 1/2] updating version to major version and few plan file fixes Signed-off-by: nikhil2611 --- .expeditor/config.yml | 2 +- VERSION | 2 +- habitat/plan.ps1 | 2 +- habitat/plan.sh | 3 ++- lib/fauxhai/version.rb | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 63f0c4bc..13c4a2d1 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -35,7 +35,7 @@ pipelines: release_branches: - workstation-LTS: - version_constraint: 0.* + version_constraint: 10.* - main: version_constraint: 9.* diff --git a/VERSION b/VERSION index a1922332..95c4e8d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.6 \ No newline at end of file +10.0.0 \ No newline at end of file diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index d3c2936e..12ab461e 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -1,7 +1,7 @@ $ErrorActionPreference = "Stop" $PSDefaultParameterValues['*:ErrorAction']='Stop' -$env:HAB_BLDR_CHANNEL = "LTS-2024" +$env:HAB_REFRESH_CHANNEL = "LTS-2024" $pkg_name="fauxhai" $pkg_origin="core" $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION") diff --git a/habitat/plan.sh b/habitat/plan.sh index c77729cf..e2ee66e8 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -1,4 +1,4 @@ -export HAB_BLDR_CHANNEL="LTS-2024" +export HAB_REFRESH_CHANNEL="LTS-2024" pkg_name=fauxhai pkg_origin=chef ruby_pkg="core/ruby3_1" @@ -11,6 +11,7 @@ pkg_build_deps=( core/libarchive ) pkg_bin_dirs=(bin) + do_setup_environment() { build_line 'Setting GEM_HOME="$pkg_prefix/vendor"' export GEM_HOME="$pkg_prefix/vendor" diff --git a/lib/fauxhai/version.rb b/lib/fauxhai/version.rb index 808fd2be..6399b64c 100644 --- a/lib/fauxhai/version.rb +++ b/lib/fauxhai/version.rb @@ -1,3 +1,3 @@ module Fauxhai - VERSION = "0.1.6".freeze + VERSION = "10.0.0".freeze end From d10aa482c3087d5daf88d88f043292f01191ca56 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 28 Jan 2025 11:43:34 +0530 Subject: [PATCH 2/2] reverting versions and fixing pipeline Signed-off-by: nikhil2611 --- .expeditor/build.habitat.yml | 5 +++- .../buildkite/artifact.habitat.test.ps1 | 1 - .expeditor/buildkite/artifact.habitat.test.sh | 1 - .expeditor/config.yml | 23 ++++++++----------- .expeditor/habitat-test.pipeline.yml | 2 ++ VERSION | 2 +- habitat/plan.ps1 | 1 - habitat/plan.sh | 1 - lib/fauxhai/version.rb | 2 +- 9 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index 72ea2567..d28cae6f 100644 --- a/.expeditor/build.habitat.yml +++ b/.expeditor/build.habitat.yml @@ -1,4 +1,7 @@ --- +env: + HAB_REFRESH_CHANNEL: "LTS-2024" + origin: chef expeditor: @@ -6,4 +9,4 @@ expeditor: buildkite: retry: automatic: - limit: 1 + limit: 1 \ No newline at end of file diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1 index 839c450d..d054dde6 100755 --- a/.expeditor/buildkite/artifact.habitat.test.ps1 +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -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' diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh index 431a6d6b..bd27b64e 100755 --- a/.expeditor/buildkite/artifact.habitat.test.sh +++ b/.expeditor/buildkite/artifact.habitat.test.sh @@ -6,7 +6,6 @@ export HAB_ORIGIN='ci' export PLAN='fauxhai' 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 diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 13c4a2d1..d967764e 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -10,9 +10,8 @@ rubygems: - fauxhai-chef artifact_channels: - - dev - - workstation-build - - LTS-2024 + - unstable + - chef-dke-lts2024 pipelines: - verify: @@ -34,8 +33,6 @@ pipelines: - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true" release_branches: - - workstation-LTS: - version_constraint: 10.* - main: version_constraint: 9.* @@ -68,22 +65,20 @@ subscriptions: ignore_labels: - "Expeditor: Skip Changelog" - "Expeditor: Skip All" + - built_in:build_gem: + only_if: built_in:bump_version - trigger_pipeline:habitat/build: ignore_labels: - "Expeditor: Skip Habitat" - "Expeditor: Skip All" only_if: built_in:bump_version - # Automatically promote the Habitat packages from unstable to dev upon successful build - - workload: buildkite_hab_build_group_published:{{agent_id}}:* - actions: - - built_in:promote_habitat_packages - - # Subscribe to the promotion of the dev channel to acceptance - - workload: project_promoted:{{agent_id}}:dev:* + - workload: project_promoted:{{agent_id}}:* actions: - - built_in:promote_habitat_packages + - built_in:rollover_changelog - - workload: project_promoted:{{agent_id}}:workstation-build:* + # Subscribe to the promotion of the unstable channel to stable(chef-dke-lts2024) + - workload: project_promoted:{{agent_id}}:unstable:* actions: - built_in:promote_habitat_packages + - built_in:publish_rubygems \ No newline at end of file diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index 86df807d..f8a9f00e 100644 --- a/.expeditor/habitat-test.pipeline.yml +++ b/.expeditor/habitat-test.pipeline.yml @@ -3,6 +3,8 @@ expeditor: defaults: buildkite: timeout_in_minutes: 30 + env: + HAB_REFRESH_CHANNEL: "LTS-2024" retry: automatic: limit: 1 diff --git a/VERSION b/VERSION index 95c4e8d2..9e0cd3a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.0 \ No newline at end of file +9.3.19 \ No newline at end of file diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 12ab461e..e5b8a85b 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -1,7 +1,6 @@ $ErrorActionPreference = "Stop" $PSDefaultParameterValues['*:ErrorAction']='Stop' -$env:HAB_REFRESH_CHANNEL = "LTS-2024" $pkg_name="fauxhai" $pkg_origin="core" $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION") diff --git a/habitat/plan.sh b/habitat/plan.sh index e2ee66e8..d612f128 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -1,4 +1,3 @@ -export HAB_REFRESH_CHANNEL="LTS-2024" pkg_name=fauxhai pkg_origin=chef ruby_pkg="core/ruby3_1" diff --git a/lib/fauxhai/version.rb b/lib/fauxhai/version.rb index 6399b64c..e4ee72dd 100644 --- a/lib/fauxhai/version.rb +++ b/lib/fauxhai/version.rb @@ -1,3 +1,3 @@ module Fauxhai - VERSION = "10.0.0".freeze + VERSION = "9.3.19".freeze end