diff --git a/.copier-answers.yml b/.copier-answers.yml index 20abd58..53dc9c3 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,4 +1,4 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v1.1.9 +_commit: v2.0.1 _src_path: https://github.com/dafyddj/copier-packer-build box_name: techneg/tkl17-x64-nocm diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 3220412..70ce5ab 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,10 +7,15 @@ "extends": [ "config:recommended", ], + "automergeStrategy": "merge-commit", "git-submodules": { "enabled": true }, "packageRules": [ + { + "matchFileNames": ["template/**"], + "semanticCommitType": "fix", + }, { "matchManagers": ["git-submodules"], "automerge": true, diff --git a/.github/workflows/libbuild.yml b/.github/workflows/libbuild.yml index 7098b18..8605a4e 100644 --- a/.github/workflows/libbuild.yml +++ b/.github/workflows/libbuild.yml @@ -103,6 +103,7 @@ jobs: if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch) env: PACKER_COMMAND: ${{ inputs.upload-box && 'build -timestamp-ui' || 'validate' }} - VAGRANT_CLOUD_TOKEN: ${{ secrets.VAGRANT_CLOUD_TOKEN }} + HCP_CLIENT_ID: ${{ secrets.HCP_CLIENT_ID }} + HCP_CLIENT_SECRET: ${{ secrets.HCP_CLIENT_SECRET }} run: | packer $PACKER_COMMAND -only \*.${{ inputs.build-os-version }} -var version=$(bin/version) -var prefix= -var no_release=false -var box_dir=box/${{ inputs.build-type }} upload diff --git a/upload/main.pkr.hcl b/upload/main.pkr.hcl index ed04502..61822c3 100644 --- a/upload/main.pkr.hcl +++ b/upload/main.pkr.hcl @@ -58,7 +58,7 @@ build { files = [ "${var.box_dir}/${source.name}.box" ] } - post-processor "vagrant-cloud" { + post-processor "vagrant-registry" { box_tag = "${var.vagrant_cloud_org}/${var.prefix}${source.name}-x64-${var.cm}" version = "${var.version}" no_release = var.no_release