diff options
| author | mwrock <matt@mattwrock.com> | 2020-12-09 08:41:21 -0800 |
|---|---|---|
| committer | mwrock <matt@mattwrock.com> | 2020-12-09 08:41:21 -0800 |
| commit | 9262ed7918c333424d8c4b324dfba40975e3c7b4 (patch) | |
| tree | 089ca019ff03b5d980614e746e84960b739b0fda | |
| parent | 01e91446ac83f656855246d7e873a28a26e41fb2 (diff) | |
| download | chef-9262ed7918c333424d8c4b324dfba40975e3c7b4.tar.gz | |
fix solaris working directory
Signed-off-by: mwrock <matt@mattwrock.com>
| -rw-r--r-- | .expeditor/release.omnibus.yml | 8 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/workstation_config_loader.rb | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 9b7f397a33..502380e4df 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -50,10 +50,10 @@ builder-to-testers-map: - sles-15-x86_64 sles-15-aarch64: - sles-15-aarch64 -# solaris2-5.11-i386: -# - solaris2-5.11-i386 -# solaris2-5.11-sparc: -# - solaris2-5.11-sparc + solaris2-5.11-i386: + - solaris2-5.11-i386 + solaris2-5.11-sparc: + - solaris2-5.11-sparc ubuntu-18.04-aarch64: - ubuntu-18.04-aarch64 - ubuntu-20.04-aarch64 diff --git a/chef-config/lib/chef-config/workstation_config_loader.rb b/chef-config/lib/chef-config/workstation_config_loader.rb index ea42211120..2e94e4de1e 100644 --- a/chef-config/lib/chef-config/workstation_config_loader.rb +++ b/chef-config/lib/chef-config/workstation_config_loader.rb @@ -142,6 +142,8 @@ module ChefConfig def working_directory if ChefUtils.windows? env["CD"] + elsif ChefUtils.solaris2? + Dir.pwd else env["PWD"] end || Dir.pwd |