diff --git a/.github/workflows/ensure-docs-compiled.yaml b/.github/workflows/ensure-docs-compiled.yaml deleted file mode 100644 index 74a174d3..00000000 --- a/.github/workflows/ensure-docs-compiled.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: Ensure Docs are Compiled -on: - push: -jobs: - ensure-docs-compiled: - runs-on: ubuntu-latest - steps: - - name: Checkout 🛎 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 - - shell: bash - run: make build-docs - - shell: bash - run: | - if [[ -z "$(git status -s)" ]]; then - echo "OK" - else - echo "Docs have been updated, but the compiled docs have not been committed." - echo "Run 'make build-docs', and commit the result to resolve this error." - exit 1 - fi - diff --git a/.goreleaser.yml b/.goreleaser.yml index 1c48ac23..f9dbc171 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -10,9 +10,6 @@ before: # We strongly recommend running tests to catch any regression before release. # Even though, this an optional step. - go test ./... - # As part of the release doc files are included as a separate deliverable for - # consumption by Packer.io. To include a separate docs.zip uncomment the following command. - - make ci-release-docs # Check plugin compatibility with required version of the Packer SDK - make plugin-check builds: @@ -98,13 +95,6 @@ signs: args: ["sign", "--dearmor", "--file", "${artifact}", "--out", "${signature}"] artifacts: checksum signature: ${artifact}.sig -release: - # If you want to manually examine the release before its live, uncomment this line: - # draft: true - # As part of the release doc files are included as a separate deliverable for consumption by Packer.io. - # To include a separate docs.zip uncomment the extra_files config and the docs.zip command hook above. - extra_files: - - glob: ./docs.zip changelog: use: github-native diff --git a/GNUmakefile b/GNUmakefile index f56a8c4b..06590c4f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -20,10 +20,6 @@ test: install-packer-sdc: ## Install packer sofware development command @go install github.com/hashicorp/packer-plugin-sdk/cmd/packer-sdc@${HASHICORP_PACKER_PLUGIN_SDK_VERSION} -ci-release-docs: install-packer-sdc - @packer-sdc renderdocs -src docs -partials docs-partials/ -dst docs/ - @/bin/sh -c "[ -d docs ] && zip -r docs.zip docs/" - plugin-check: install-packer-sdc build @packer-sdc plugin-check ${BINARY} @@ -32,11 +28,7 @@ testacc: dev generate: install-packer-sdc @go generate ./... - packer-sdc renderdocs -src ./docs -dst ./.docs -partials ./docs-partials - # checkout the .docs folder for a preview of the docs - -build-docs: install-packer-sdc - @if [ -d ".docs" ]; then rm -r ".docs"; fi + @rm -rf .docs @packer-sdc renderdocs -src "docs" -partials docs-partials/ -dst ".docs/" @./.web-docs/scripts/compile-to-webdocs.sh "." ".docs" ".web-docs" "hashicorp" @rm -r ".docs"