Merge branch 'main' into support-azure-cache-skus

inspec · Mar 31, 2022 · c275d85 · c275d85
2 parents 49694c6 + 6e87451
commit c275d85
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Changelog
-<!-- latest_release 1.114.2 -->
+<!-- latest_release 1.114.3 -->
+## [v1.114.3](https://github.com/inspec/inspec-azure/tree/v1.114.3) (2022-03-29)
+
+#### Merged Pull Requests
+- Update docs makefile [#647](https://github.com/inspec/inspec-azure/pull/647) ([IanMadd](https://github.com/IanMadd))
+<!-- latest_release -->
+
 ## [v1.114.2](https://github.com/inspec/inspec-azure/tree/v1.114.2) (2022-03-21)
 
 #### Merged Pull Requests
 - Adding Logging Enabled Check to Azure Key Vault [#644](https://github.com/inspec/inspec-azure/pull/644) ([jnikles1](https://github.com/jnikles1))
-<!-- latest_release -->
 
 ## [v1.114.1](https://github.com/inspec/inspec-azure/tree/v1.114.1) (2022-03-14)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.114.2
+1.114.3
diff --git a/docs-chef-io/Makefile b/docs-chef-io/Makefile
@@ -3,9 +3,13 @@
 SHELL=bash
 
 preview_netlify: chef_web_docs
-	cp -R content/inspec/resources/* chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/content/inspec/resources/
-	cp -R config.toml chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/
-	pushd chef-web-docs && make assets; hugo --gc --minify --buildFuture && popd
+	rm -rf chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/content/inspec/resources/*
+	rm -rf chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/layouts/*
+	cp -R ./content/inspec/resources/* ./chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/content/inspec/resources/
+	cp -R layouts/* chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/layouts/
+	cp -R ./config.toml ./chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/
+	cp -R assets/release-notes/inspec-azure/release-dates.json chef-web-docs/_vendor/github.com/inspec/inspec-azure/docs-chef-io/assets/release-notes/inspec-azure
+	pushd chef-web-docs && make bundle; hugo --gc --minify --buildFuture --environment preview && popd
 
 
 replace = "replacements = \'github.com/inspec/inspec-azure/docs-chef-io -\> ../../\'\\n\\n"
@@ -15,7 +19,7 @@ serve: chef_web_docs
 	@cat chef-web-docs/config/_default/module.toml >> temp.txt
 	@cat temp.txt > chef-web-docs/config/_default/module.toml
 	rm temp.txt
-	pushd chef-web-docs && make assets; hugo server --buildDrafts --buildFuture --noHTTPCache && popd
+	pushd chef-web-docs && make bundle; hugo server --buildDrafts --buildFuture --noHTTPCache && popd
 
 chef_web_docs:
 	if [ -d "chef-web-docs/" ]; then \

diff --git a/docs-chef-io/netlify.toml b/docs-chef-io/netlify.toml
@@ -1,7 +1,7 @@
 [build]
 
 [build.environment]
-  HUGO_VERSION = "0.93.1"
+  HUGO_VERSION = "0.91.2"
   HUGO_ENABLEGITINFO = "true"
   GO_VERSION = "1.15"
   NODE_ENV = "development"
@@ -12,6 +12,7 @@
 [context.deploy-preview]
   publish = "chef-web-docs/public"
   command = "make preview_netlify"
+  HUGO_ENV = "preview"
 
 [context.production]
   publish = "netlify_production"

diff --git a/inspec.yml b/inspec.yml
@@ -5,7 +5,7 @@ copyright: Chef Software, Inc.
 copyright_email: support@chef.io
 license: Apache-2.0
 summary: This resource pack provides compliance resources for Azure.
-version: 1.114.2
+version: 1.114.3
 inspec_version: '>= 4.18.39'
 supports:
   - platform: azure