Skip to content

Commit 6a85a44

Browse files
committed
Updating for packer 1.6.0
* Updating to use packer 1.6.0 * Upgraded ther go modules as well * Re generated mapstructure-to-hcl2 * Updating circleci release tagging. * using curl to fetch asc key since wget was using old certificates.
1 parent be7e9ee commit 6a85a44

File tree

5 files changed

+287
-90
lines changed

5 files changed

+287
-90
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ executors:
77
working_directory: ~/packer-provisioner-serverspec
88
golang:
99
docker:
10-
- image: circleci/golang:1.13.8
10+
- image: circleci/golang:1.13.12
1111
working_directory: ~/packer-provisioner-serverspec
1212
environment:
1313
ALPINE_VERSION: '3.10'
@@ -16,7 +16,7 @@ executors:
1616
- image: circleci/ruby:2.5.5
1717
working_directory: ~/packer-provisioner-serverspec
1818
environment:
19-
PACKER_VERSION: '1.5.4'
19+
PACKER_VERSION: '1.6.0'
2020
HASHI_KEY_URL: 'https://keybase.io/hashicorp/key.asc'
2121
jobs:
2222
build_provisioner:
@@ -48,7 +48,7 @@ jobs:
4848
mkdir -p /tmp/build
4949
cd /tmp/build
5050
gem install net-ssh io-console bundler rake rspec serverspec --no-document
51-
wget -O - $HASHI_KEY_URL | gpg --import
51+
curl $HASHI_KEY_URL -o - | gpg --import
5252
wget -q "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip"
5353
wget -q "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_SHA256SUMS"
5454
wget -q "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_SHA256SUMS.sig"
@@ -105,4 +105,4 @@ workflows:
105105
branches:
106106
ignore: /.*/
107107
tags:
108-
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])+)))*))?)$/
108+
only: /^v\d+\.\d+\.\d+$/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ A system-chosen port is used when `local_port` is missing or empty.
105105
Development
106106
------------
107107

108-
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.
108+
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.
109109

110110
```bash
111111
go install github.com/hashicorp/packer/cmd/mapstructure-to-hcl2

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/unifio/packer-provisioner-serverspec
22

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

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

0 commit comments

Comments
 (0)