Skip to content

Commit

Permalink
Merge pull request #1464 from chef/fix_release_test
Browse files Browse the repository at this point in the history
After removing the /usr/local symlink we need to chef exec our test so it finds the utility in embedded/bin
  • Loading branch information
tyler-ball authored Sep 3, 2020
2 parents 832d079 + ced3af9 commit 12c2ef5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion omnibus/omnibus-test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ hab help
If ($lastexitcode -ne 0) { Exit $lastexitcode }

Write-Output " * chef-automate-collect -h"
chef-automate-collect -h
chef exec chef-automate-collect -h
If ($lastexitcode -ne 0) { Exit $lastexitcode }

Write-Output "--- Run the verification suite"
Expand Down
2 changes: 1 addition & 1 deletion omnibus/omnibus-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ echo "--- Ensure that 'hab' cli is available"
hab help

echo "--- Ensure that 'chef-automate-collect' cli is available"
chef-automate-collect -h
chef exec chef-automate-collect -h

# Verify that the chef-workstation-app was installed (MacOS only)
if is_darwin; then
Expand Down
7 changes: 4 additions & 3 deletions www/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ SHELL=bash

assets:
git submodule update --init --recursive
git submodule foreach git pull origin master
git submodule foreach git reset --hard
pushd chef-web-docs/themes/docs-new && make assets && popd

clean:
Expand All @@ -16,7 +18,7 @@ clean_all:
rm -rf chef-web-docs/results/

preview_netlify: chef_web_docs_submodule
pushd chef-web-docs && make assets; hugo --gc --minify --enableGitInfo --buildFuture && popd
pushd chef-web-docs && make assets; hugo --buildFuture --gc --minify --enableGitInfo && popd

chef_web_docs_submodule:
git submodule update --init --recursive
Expand All @@ -30,8 +32,7 @@ reset_chef_web_docs:
git submodule foreach git clean -f -d

serve: assets
cd chef-web-docs
hugo server --buildDrafts --noHTTPCache --buildFuture
hugo server --buildDrafts --buildFuture --noHTTPCache

lint: assets
hugo -D
2 changes: 1 addition & 1 deletion www/chef-web-docs
Submodule chef-web-docs updated 1975 files

0 comments on commit 12c2ef5

Please sign in to comment.