diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-12-20 11:48:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-20 11:48:22 -0800 |
| commit | 26702b0235e928f19122bc8a55021519b0d98e1c (patch) | |
| tree | dbd7677a1fdba73942be1bc0f010b0e92b80812c | |
| parent | 4a6d6253c5130222baa0f5968d6aa251553eb8b9 (diff) | |
| parent | b9a77383d659bfba014cfd920f515a4e6df02819 (diff) | |
| download | chef-26702b0235e928f19122bc8a55021519b0d98e1c.tar.gz | |
Merge branch 'chef-16' into jfm/chef16_ssl_errors
8 files changed, 3 insertions, 4 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 246ed5cb2b..2590a61bf8 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -22,7 +22,7 @@ rubygems: schedules: - name: nightly_build_chef_16 description: "Run a nightly build in the Buildkite pipeline" - cronline: "30 2 * * 2,4" + cronline: "30 2 * * *" pipelines: - verify: diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 0ddf4d6a10..1228919510 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -61,7 +61,6 @@ function Invoke-Prepare { try { Push-Location "${HAB_CACHE_SRC_PATH}/${pkg_dirname}" - Write-BuildLine " ** Configuring bundler for this build environment" bundle config --local without server docgen maintenance pry travis integration ci chefstyle if (-not $?) { throw "unable to configure bundler to restrict gems to be installed" } @@ -96,10 +95,10 @@ function Invoke-Build { } } Write-BuildLine " ** Running the chef project's 'rake install' to install the path-based gems so they look like any other installed gem." - bundle exec rake install # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler + bundle exec rake install --trace=stdout # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler if (-not $?) { Write-Warning " -- That didn't work. Let's try again." - bundle exec rake install --verbose # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler + bundle exec rake install --trace=stdout # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler if (-not $?) { throw "unable to install the gems that live in directories within this repo" } } } finally { diff --git a/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 b/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 Binary files differdeleted file mode 100644 index 3c5e406935..0000000000 --- a/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 +++ /dev/null diff --git a/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz b/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz Binary files differdeleted file mode 100644 index ddccd353ae..0000000000 --- a/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz +++ /dev/null diff --git a/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 b/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 Binary files differdeleted file mode 100644 index 50bbe1f37f..0000000000 --- a/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 +++ /dev/null diff --git a/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 b/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 Binary files differdeleted file mode 100644 index e341e1df69..0000000000 --- a/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 +++ /dev/null diff --git a/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz b/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz Binary files differdeleted file mode 100644 index 9636d5b868..0000000000 --- a/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz +++ /dev/null diff --git a/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz b/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz Binary files differdeleted file mode 100644 index afa4b4db9a..0000000000 --- a/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz +++ /dev/null |