Skip to content

Commit

Permalink
Merge branch 'main' into nikhil/CHEF-8691-mac_os-13-support
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhil2611 authored Jun 3, 2024
2 parents 6200fe1 + 9910c09 commit a3ddc70
Show file tree
Hide file tree
Showing 367 changed files with 12,101 additions and 9,124 deletions.
4 changes: 2 additions & 2 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ steps:
expeditor:
executor:
docker:
image: ruby:3.1
image: ruby:3.1-bullseye
# This tests that our verify.rb script (and dependencies) can successfully test components included in CW
- label: component-test-tests-ruby-3.1
command:
- .expeditor/run_linux_tests.sh rspec omnibus/verification
expeditor:
executor:
docker:
image: ruby:3.1
image: ruby:3.1-bullseye
- label: ":linux: :darwin: :windows: top-level chef cmd"
commands:
- cd components/main-chef-wrapper
Expand Down
24 changes: 21 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
<!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
<!-- latest_release -->
<!-- latest_release 24.5.1065 -->
## [24.5.1065](https://github.com/chef/chef-workstation/tree/24.5.1065) (2024-05-14)

#### Merged Pull Requests
- [CHEF-8498] Ruby implementation of c_rehash script [#3234](https://github.com/chef/chef-workstation/pull/3234) ([ashiqueps](https://github.com/ashiqueps))
<!-- latest_release -->

<!-- release_rollup -->
<!-- release_rollup since=24.4.1064 -->
### Changes not yet released to stable

#### Merged Pull Requests
- [CHEF-8498] Ruby implementation of c_rehash script [#3234](https://github.com/chef/chef-workstation/pull/3234) ([ashiqueps](https://github.com/ashiqueps)) <!-- 24.5.1065 -->
<!-- release_rollup -->

<!-- latest_stable_release -->
## [24.4.1064](https://github.com/chef/chef-workstation/tree/24.4.1064) (2024-04-30)

#### Merged Pull Requests
- Updated chef-client to 18.4.2 [#3205](https://github.com/chef/chef-workstation/pull/3205) ([nikhil2611](https://github.com/nikhil2611))
- Update Netlify docs deploy method [#3217](https://github.com/chef/chef-workstation/pull/3217) ([IanMadd](https://github.com/IanMadd))
- Bump omnibus-software from `9d0fd56` to `4ea194c` in /omnibus [#3219](https://github.com/chef/chef-workstation/pull/3219) ([dependabot[bot]](https://github.com/dependabot[bot]))
- Bump artifactory from 3.0.15 to 3.0.17 in /omnibus [#3211](https://github.com/chef/chef-workstation/pull/3211) ([dependabot[bot]](https://github.com/dependabot[bot]))
- Modified the steps to install the FIPS provider for OpenSSL [#3203](https://github.com/chef/chef-workstation/pull/3203) ([ashiqueps](https://github.com/ashiqueps))
- Updated the dependencies for the 24.04 release [#3222](https://github.com/chef/chef-workstation/pull/3222) ([ashiqueps](https://github.com/ashiqueps))
<!-- latest_stable_release -->

## [24.2.1058](https://github.com/chef/chef-workstation/tree/24.2.1058) (2024-02-20)

#### Merged Pull Requests
- Bump omnibus-software from `d357d5c` to `86649fa` in /omnibus [#3196](https://github.com/chef/chef-workstation/pull/3196) ([dependabot[bot]](https://github.com/dependabot[bot]))
- chef-Workstation 24.2 release [#3198](https://github.com/chef/chef-workstation/pull/3198) ([nikhil2611](https://github.com/nikhil2611))
- Adding Amazon linux 2023 to the release pipeline [#3143](https://github.com/chef/chef-workstation/pull/3143) ([nikhil2611](https://github.com/nikhil2611))
<!-- latest_stable_release -->

## [23.12.1055](https://github.com/chef/chef-workstation/tree/23.12.1055) (2023-12-07)

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:22.04
LABEL maintainer="Chef Software, Inc. <[email protected]>"

ARG CHANNEL=stable
ARG VERSION=24.2.1058
ARG VERSION=24.4.1064
ENV DEBIAN_FRONTEND=noninteractive \
GEM_HOME=/root/.chefdk/gem/ruby/3.0.0 \
PATH=/opt/chef-workstation/bin:/opt/chef-workstation/embedded/bin:/root/.chefdk/gem/ruby/3.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Chef Workstation installs everything you need to get started using Chef products

## Getting Started

1. Download [Chef Workstation](https://downloads.chef.io/chef-workstation)
1. Download [Chef Workstation](https://www.chef.io/downloads)

2. Double-click the `.dmg` or `.msi` file to start the install process, or use the package manager for your Linux distribution.

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.2.1058
24.5.1065
7 changes: 6 additions & 1 deletion components/gems/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ group(:omnibus_package, :development, :test) do
gem "guard"
gem "cookstyle", ">= 7.8"
gem "ffi-libarchive"

# The current version of OpenSSL that we are bundling with chef-workstation is 3.0.11
# The version of ruby/openssl that supports the FIPS mode of OpenSSL 3.0/3.1 is 3.2.0
# and later, hence pinning the version for openssl.
gem "openssl", ">= 3.2.0"
end

group(:dep_selector) do
Expand All @@ -43,7 +48,7 @@ group(:omnibus_package) do
gem "chef_deprecations", ">= 0.1.2"

# avoid failures running 0.0.7.7 on windows
gem "unf_ext", ">= 0.0.8.2"
gem "unf_ext", "~> 0.0.8.2"

gem "appbundler"

Expand Down
Loading

0 comments on commit a3ddc70

Please sign in to comment.