From 668dbe760cea8f1a082214af334b4c6c57ba3724 Mon Sep 17 00:00:00 2001 From: Ian Maddaus Date: Tue, 15 Mar 2022 19:00:29 -0400 Subject: [PATCH 1/3] Update docs makefile Signed-off-by: Ian Maddaus --- docs-chef-io/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-chef-io/Makefile b/docs-chef-io/Makefile index 990640a5d..3a9736640 100644 --- a/docs-chef-io/Makefile +++ b/docs-chef-io/Makefile @@ -5,7 +5,7 @@ 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 + pushd chef-web-docs && make bundle; hugo --gc --minify --buildFuture && popd replace = "replacements = \'github.com/inspec/inspec-azure/docs-chef-io -\> ../../\'\\n\\n" @@ -15,7 +15,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 \ From 4f42953e231892927de0fdd26a867395ddbaf75d Mon Sep 17 00:00:00 2001 From: Ian Maddaus Date: Tue, 22 Mar 2022 16:42:32 -0400 Subject: [PATCH 2/3] More makefile changes Signed-off-by: Ian Maddaus --- docs-chef-io/Makefile | 10 +++++++--- docs-chef-io/netlify.toml | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs-chef-io/Makefile b/docs-chef-io/Makefile index 3a9736640..d7f17e5ea 100644 --- 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 bundle; 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" diff --git a/docs-chef-io/netlify.toml b/docs-chef-io/netlify.toml index 0c96e1c4c..f43fcfd64 100644 --- 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" From 6e87451c3b17c73f8cf5b3fcc60424afcd9782a4 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Tue, 29 Mar 2022 19:56:19 +0000 Subject: [PATCH 3/3] Bump version to 1.114.3 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 9 +++++++-- VERSION | 2 +- inspec.yml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f7d196c7..4d77c2724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,15 @@ # Changelog - + +## [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)) + + ## [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)) - ## [v1.114.1](https://github.com/inspec/inspec-azure/tree/v1.114.1) (2022-03-14) diff --git a/VERSION b/VERSION index 958f2ade4..9166b8852 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.114.2 \ No newline at end of file +1.114.3 \ No newline at end of file diff --git a/inspec.yml b/inspec.yml index 761c3c01e..fceac6587 100644 --- 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