Skip to content

Commit

Permalink
Merge pull request #15 from unifio/dmi-upgrade-packer-1.6.0
Browse files Browse the repository at this point in the history
Updating for packer 1.6.0
  • Loading branch information
disaac authored Jun 15, 2020
2 parents be7e9ee + 6a85a44 commit b3cea89
Show file tree
Hide file tree
Showing 5 changed files with 287 additions and 90 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ executors:
working_directory: ~/packer-provisioner-serverspec
golang:
docker:
- image: circleci/golang:1.13.8
- image: circleci/golang:1.13.12
working_directory: ~/packer-provisioner-serverspec
environment:
ALPINE_VERSION: '3.10'
Expand All @@ -16,7 +16,7 @@ executors:
- image: circleci/ruby:2.5.5
working_directory: ~/packer-provisioner-serverspec
environment:
PACKER_VERSION: '1.5.4'
PACKER_VERSION: '1.6.0'
HASHI_KEY_URL: 'https://keybase.io/hashicorp/key.asc'
jobs:
build_provisioner:
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
mkdir -p /tmp/build
cd /tmp/build
gem install net-ssh io-console bundler rake rspec serverspec --no-document
wget -O - $HASHI_KEY_URL | gpg --import
curl $HASHI_KEY_URL -o - | gpg --import
wget -q "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip"
wget -q "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_SHA256SUMS"
wget -q "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_SHA256SUMS.sig"
Expand Down Expand Up @@ -105,4 +105,4 @@ workflows:
branches:
ignore: /.*/
tags:
only: /(?<=^[Vv]|^)(?:(?<major>(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?<minor>(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?<patch>(?:0|[1-9](?:(?:0|[1-9])+)*))(?:-(?<prerelease>(?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:0|[1-9](?:(?:0|[1-9])+)*))(?:[.](?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:0|[1-9](?:(?:0|[1-9])+)*)))*))?(?:[+](?<build>(?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:(?:0|[1-9])+))(?:[.](?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:(?:0|[1-9])+)))*))?)$/
only: /^v\d+\.\d+\.\d+$/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ A system-chosen port is used when `local_port` is missing or empty.
Development
------------

Packer 1.5.4 Added hcl2 support. In order to autogenerate support for this. Anytime a change to the `Config` struct is made you need to do the following to build.
Packer 1.6.0 Added hcl2 support. In order to autogenerate support for this. Anytime a change to the `Config` struct is made you need to do the following to build.

```bash
go install github.com/hashicorp/packer/cmd/mapstructure-to-hcl2
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/unifio/packer-provisioner-serverspec

require (
github.com/hashicorp/hcl/v2 v2.3.0
github.com/hashicorp/packer v1.5.4
github.com/zclconf/go-cty v1.2.1
golang.org/x/crypto v0.0.0-20200117160349-530e935923ad
github.com/hashicorp/hcl/v2 v2.6.0
github.com/hashicorp/packer v1.6.0
github.com/zclconf/go-cty v1.5.0
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
)

replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
Expand Down
Loading

0 comments on commit b3cea89

Please sign in to comment.