Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

After removing the /usr/local symlink we need to chef exec our test so it finds the utility in embedded/bin #1464

Merged
merged 3 commits into from
Sep 3, 2020
Merged

After removing the /usr/local symlink we need to chef exec our test so it finds the utility in embedded/bin #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7554514
After removing the /usr/local symlink we need to chef exec our test s…
tyler-ball Sep 3, 2020
6ac4913
Copying the Inspec chef-web-docs Makefile to fix our build issues
tyler-ball Sep 3, 2020
ced3af9
Updating to the latest chef-web-docs submodule version
tyler-ball Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion omnibus/omnibus-test.ps1
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Open in desktop
Submodule chef-web-docs updated 1975 files