Skip to content

Commit

Permalink
Merge branch 'main' into nikhil/CHEF-15132-WS-release
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhil2611 authored Nov 6, 2024
2 parents b01c28c + 86d1adc commit 2581894
Show file tree
Hide file tree
Showing 599 changed files with 32 additions and 266,351 deletions.
4 changes: 2 additions & 2 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
expeditor:
cached_folders:
- vendor
# cached_folders:
# - vendor
defaults:
buildkite:
retry:
Expand Down
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
<!-- latest_release 24.10.1070 -->
## [24.10.1070](https://github.com/chef/chef-workstation/tree/24.10.1070) (2024-10-08)
<!-- latest_release 24.10.1071 -->
## [24.10.1071](https://github.com/chef/chef-workstation/tree/24.10.1071) (2024-10-23)

#### Merged Pull Requests
- Update knife_ssh.md [#3271](https://github.com/chef/chef-workstation/pull/3271) ([IanMadd](https://github.com/IanMadd))
- Vendor dir removed and Go version updated [#3279](https://github.com/chef/chef-workstation/pull/3279) ([sanghinitin](https://github.com/sanghinitin))
<!-- latest_release -->

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

#### Merged Pull Requests
- Vendor dir removed and Go version updated [#3279](https://github.com/chef/chef-workstation/pull/3279) ([sanghinitin](https://github.com/sanghinitin)) <!-- 24.10.1071 -->
- Update knife_ssh.md [#3271](https://github.com/chef/chef-workstation/pull/3271) ([IanMadd](https://github.com/IanMadd)) <!-- 24.10.1070 -->
- Remove references to packages.chef.io [#3281](https://github.com/chef/chef-workstation/pull/3281) ([dishanktiwari2501](https://github.com/dishanktiwari2501)) <!-- 24.10.1069 -->
<!-- release_rollup -->
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.10.1070
24.10.1071
2 changes: 1 addition & 1 deletion components/main-chef-wrapper/.studiorc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ hab pkg install chef/studio-common >/dev/null
source "$(hab pkg path chef/studio-common)/bin/studio-common"

# switch all go commands to use the vendor/ directory
export GOFLAGS="-mod=vendor"
#export GOFLAGS="-mod=vendor"

# Specify where to put 'go installed' binaries
export GOBIN=/src/bin
Expand Down
15 changes: 8 additions & 7 deletions components/main-chef-wrapper/go.mod
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
module github.com/chef/chef-workstation/components/main-chef-wrapper

go 1.17
go 1.22

require (
github.com/chef/go-chef-cli v0.0.4
github.com/chef/go-libs v0.4.2
github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.8.0
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.9.0
golang.org/x/sys v0.20.0
golang.org/x/sys v0.25.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-chef/chef v0.24.5 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/pretty v0.2.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/muesli/termenv v0.11.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v3 v3.0.1
)

replace github.com/go-chef/chef v0.24.5 => github.com/chef/go-chef v0.4.5
761 changes: 14 additions & 747 deletions components/main-chef-wrapper/go.sum

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2581894

Please sign in to comment.