Merge branch 'main' into patch-2

chef · Nov 29, 2023 · ff54364 · ff54364
2 parents 4551f29 + 4bb9837
commit ff54364
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
@@ -28,6 +28,12 @@ pipelines:
       env:
         - ADHOC: true
         - IGNORE_ARTIFACTORY_RUBY_PROXY: true
+  - omnibus/adhoc-canary:
+      canary: true
+      definition: .expeditor/release.omnibus.yml
+      env:
+        - ADHOC: true
+        - IGNORE_ARTIFACTORY_RUBY_PROXY: true        
   - third-party-packages:
       description: post-release publishing of Workstation packages to third party distribution platforms
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,17 @@
 <!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
-<!-- latest_release 23.9.1050 -->
-## [23.9.1050](https://github.com/chef/chef-workstation/tree/23.9.1050) (2023-09-25)
+<!-- latest_release 23.11.1052 -->
+## [23.11.1052](https://github.com/chef/chef-workstation/tree/23.11.1052) (2023-11-27)
 
 #### Merged Pull Requests
-- Bump omnibus from `26c34d2` to `56015cb` in /omnibus [#3162](https://github.com/chef/chef-workstation/pull/3162) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Updated the msi signing method [#3183](https://github.com/chef/chef-workstation/pull/3183) ([ashiqueps](https://github.com/ashiqueps))
 <!-- latest_release -->
 
 <!-- release_rollup since=23.7.1042 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Updated the msi signing method [#3183](https://github.com/chef/chef-workstation/pull/3183) ([ashiqueps](https://github.com/ashiqueps)) <!-- 23.11.1052 -->
+- adding adhoc canary [#3178](https://github.com/chef/chef-workstation/pull/3178) ([sean-simmons-progress](https://github.com/sean-simmons-progress)) <!-- 23.11.1051 -->
 - Bump omnibus from `26c34d2` to `56015cb` in /omnibus [#3162](https://github.com/chef/chef-workstation/pull/3162) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 23.9.1050 -->
 - Updated the chef-cli version to 5.6.13 [#3160](https://github.com/chef/chef-workstation/pull/3160) ([nikhil2611](https://github.com/nikhil2611)) <!-- 23.9.1049 -->
 - Bump omnibus from `ae855f3` to `26c34d2` in /omnibus [#3148](https://github.com/chef/chef-workstation/pull/3148) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 23.8.1048 -->

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-23.9.1050
+23.11.1052
diff --git a/omnibus/config/projects/chef-workstation.rb b/omnibus/config/projects/chef-workstation.rb
@@ -127,7 +127,7 @@
   fast_msi true
   upgrade_code "9870C512-DF2C-43D9-8C28-7ACD60ABBE27"
   wix_light_extension "WixUtilExtension"
-  signing_identity "13B510D1CF1B3467856A064F1BEA12D0884D2528", machine_store: true
+  signing_identity "769E6AF679126F184850AAC7C5C823A80DB3ADAA", machine_store: false, keypair_alias: "key_495941360"
 end
 
 # We don't support appx builds, and they eat a lot of time.