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.

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

Replace old workstation docs with new workstation docs #1037

Merged
merged 15 commits into from
Mar 31, 2020
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .expeditor/buildkite/hugo_lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

set -euo pipefail

LINT_STATUS="$(grep -r -I --color=auto -o --with-filename -n -P '[^\x00-\x7F]' ./www/site/content/docs &> /dev/null ; echo $?)"
LINT_STATUS="$(grep -r -I --color=auto -o --with-filename -n -P '[^\x00-\x7F]' ./www/content | grep -v '[✓]' &> /dev/null ; echo $?)"

if [ "$LINT_STATUS" == 1 ]; then
echo "Success!"
exit 0
else
echo "Failure!"
grep -r -I --color=auto -o --with-filename -n -P '[^\x00-\x7F]' ./www/site/content/docs
grep -r -I --color=auto -o --with-filename -n -P '[^\x00-\x7F]' ./www/content | grep -v '[✓]'
if [ "$LINT_STATUS" == 0 ]; then
exit 1
else
Expand Down
37 changes: 27 additions & 10 deletions www/.gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,30 @@
# Hugo
public
.DS_Store

# markdownlint
.markdownlint.json
# ignore doctree files in translation folders
*.doctree
*.pickle

# chef-www-acceptance.cd.chef.co content
chef-sh
public/
/resources/

**/.sass-cache
**/.sass-cache/*
*.css.map
*.css_t.map

/.delivery/cli.toml

/.vscode

/.venv

*.*~
*~
TAGS

results/

static/fonts/fontawesome
node_modules
vendor

# upstream repos
chef-www
site/themes/chef
site/layouts
30 changes: 12 additions & 18 deletions www/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,20 @@
# so we have to override the default shell here
SHELL=bash

chef-www:
git clone https://github.com/chef/chef-www.git chef-www

site/themes/chef:
git clone https://github.com/chef/chef-hugo-theme.git site/themes/chef
assets:
pushd themes/docs-new && make assets && popd

clean:
rm -rf chef-sh
rm -rf chef-www
rm -rf site/layouts
rm -rf site/themes/chef
pushd themes/docs-new && make clean && popd
rm -rf resources/

sync: chef-www site/themes/chef
pushd chef-www && git fetch && git reset --hard origin/master && popd
pushd site/themes/chef && git fetch && git reset --hard origin/master && popd
cp -R chef-www/site/layouts site/
aws --profile chef-cd s3 sync s3://chef-www-acceptance.cd.chef.co chef-sh --delete
clean_all:
pushd themes/docs-new && make clean_all && popd
rm -rf resources/
rm -rf results/

serve: sync
cd site && hugo server --buildDrafts --noHTTPCache
serve: assets
hugo server --buildDrafts --noHTTPCache --config=config.toml,config_workstation_menu.toml

lint: chef-www site/themes/chef
pushd site && hugo -D && popd
lint: assets
hugo -D
Loading