Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update circleci image to use new cimg namespace with Go1.17 #93

Merged
merged 3 commits into from Dec 15, 2021
Merged

Update circleci image to use new cimg namespace with Go1.17 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef856b8
Update circleci image to use new cimg namespace with Go1.17
nywilken Dec 14, 2021
acdfe4d
Update build tags for Go 1.17
nywilken Dec 14, 2021
5c47db6
Fix path to Go working directory on linux
nywilken Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ environment: &ENVIRONMENT
executors:
golang:
docker:
- image: docker.mirror.hashicorp.services/circleci/golang:1.16
- image: docker.mirror.hashicorp.services/cimg/go:1.17
resource_class: medium+
darwin:
macos:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
test-linux:
executor: golang
resource_class: large
working_directory: /go/src/github.com/hashicorp/packer-plugin-sdk
working_directory: ~/go/src/github.com/hashicorp/packer-plugin-sdk
steps:
- checkout
- run: make vet
Expand All @@ -68,14 +68,14 @@ jobs:
steps:
- install-go-run-tests-unix:
GOOS: darwin
GOVERSION: "1.16"
GOVERSION: "1.17"
test-windows:
executor:
name: win/vs2019
shell: bash.exe
steps:
- install-go-run-tests-windows:
GOVERSION: "1.16"
GOVERSION: "1.17"
check-lint:
executor: golang
resource_class: xlarge
Expand All @@ -92,7 +92,7 @@ jobs:
- run: make fmt-check
check-generate:
executor: golang
working_directory: /go/src/github.com/hashicorp/packer-plugin-sdk
working_directory: ~/go/src/github.com/hashicorp/packer-plugin-sdk
steps:
- checkout
- run: make generate-check
Expand Down
1 change: 1 addition & 0 deletions filelock/filelock.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build !solaris
// +build !solaris
Comment on lines +1 to 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we only keep the newer//more readable version here ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe not in case this gets built with go 1.16

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh interesting. I thought it was a direct replace of the build tag. Packer currently has both so maybe we can keep it consistent, and remove once 1.18 is out. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup sounds good to me !


package filelock
Expand Down
1 change: 1 addition & 0 deletions multistep/commonsteps/iso_config_test.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package commonsteps
Expand Down
1 change: 1 addition & 0 deletions packer/cache_config_unix.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build darwin || freebsd || linux || netbsd || openbsd || solaris
// +build darwin freebsd linux netbsd openbsd solaris

package packer
Expand Down
1 change: 1 addition & 0 deletions packer/cache_config_unix_test.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build darwin || freebsd || linux || netbsd || openbsd || solaris
// +build darwin freebsd linux netbsd openbsd solaris

package packer
Expand Down
1 change: 1 addition & 0 deletions packer/cache_config_windows.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

package packer
Expand Down
1 change: 1 addition & 0 deletions packer/cache_config_windows_test.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

package packer
Expand Down
1 change: 1 addition & 0 deletions pathing/config_file_unix.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build darwin || freebsd || linux || netbsd || openbsd || solaris
// +build darwin freebsd linux netbsd openbsd solaris

package pathing
Expand Down
1 change: 1 addition & 0 deletions pathing/config_file_unix_test.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build darwin || freebsd || linux || netbsd || openbsd || solaris
// +build darwin freebsd linux netbsd openbsd solaris

package pathing
Expand Down
1 change: 1 addition & 0 deletions pathing/config_file_windows.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

package pathing
Expand Down
1 change: 1 addition & 0 deletions pathing/config_file_windows_test.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

package pathing
Expand Down
1 change: 1 addition & 0 deletions sdk-internals/communicator/ssh/communicator_test.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build !race
// +build !race

package ssh
Expand Down
1 change: 1 addition & 0 deletions template/parse_test.go
View file
Open in desktop
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package template
Expand Down