Skip to content

Commit

Permalink
Merge pull request #343 from tagur87/go1.16-support
Browse files Browse the repository at this point in the history
 Update to go1.16, modules, darwin/arm64 support
  • Loading branch information
ggongaware committed May 8, 2021
2 parents f9cad84 + d625689 commit 73d06e3
Show file tree
Hide file tree
Showing 8 changed files with 147 additions and 376 deletions.
37 changes: 16 additions & 21 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,29 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.x
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: ^1.16
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Get dependencies
run: |
go get -v -t -d ./...
if [ -f Gopkg.toml ]; then
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep ensure
fi
- name: Make bin dir
run: mkdir -p bin

- name: build terraform-provider-proxmox
run: |
go build -o bin/terraform-provider-proxmox cmd/terraform-provider-proxmox/*
run: go build -v .

test:
name: Test
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.16
uses: actions/setup-go@v2
with:
go-version: ^1.16
id: go
- name: Check out code
uses: actions/checkout@v2
- name: Test
run: go test -v ./...

- uses: actions/upload-artifact@v2
with:
name: terraform-provider-proxmox
path: bin/ # or path/to/artifact

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.16.3
-
name: Import GPG key
id: import_gpg
Expand Down
26 changes: 2 additions & 24 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,9 @@ builds:
ignore:
- goos: darwin
goarch: "386"
- goos: darwin
goarch: arm
binary: "terraform-provider-proxmox_v{{ .Version }}"
dir: cmd/terraform-provider-proxmox
# - id: terraform-provisioner-proxmox
# env:
# - CGO_ENABLED=0
# mod_timestamp: "{{ .CommitTimestamp }}"
# flags:
# - -trimpath
# ldflags:
# - "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}"
# goos:
# - freebsd
# - windows
# - linux
# - darwin
# goarch:
# - amd64
# - "386"
# - arm
# - arm64
# ignore:
# - goos: darwin
# goarch: "386"
# binary: "terraform-provisioner-proxmox_v{{ .Version }}"
# dir: cmd/terraform-provisioner-proxmox
archives:
- format: zip
name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cache:
- $HOME/.cache/go-build
- $HOME/gopath/pkg/mod
go:
- 1.13.x
- 1.16.x

git:
depth: 1
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ test:
build: clean
@echo " -> Building"
mkdir -p bin
CGO_ENABLED=0 go build -o bin/terraform-provider-proxmox cmd/terraform-provider-proxmox/*
CGO_ENABLED=0 go build -o bin/terraform-provider-proxmox
@echo "Built terraform-provider-proxmox"

acctest: build
Expand Down
11 changes: 4 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
module github.com/Telmate/terraform-provider-proxmox

go 1.13
go 1.16

require (
github.com/Telmate/proxmox-api-go v0.0.0-20210429201316-cb769f4e78c9
github.com/aws/aws-sdk-go v1.31.9
github.com/hashicorp/terraform v0.13.4 // indirect
github.com/hashicorp/terraform-plugin-sdk v1.13.0 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.1.0
github.com/rs/zerolog v1.19.0
github.com/Telmate/proxmox-api-go v0.0.0-20210507143528-c60bbda13c0c
github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.1
github.com/rs/zerolog v1.21.0
)
443 changes: 122 additions & 321 deletions go.sum

Large diffs are not rendered by default.

File renamed without changes.

0 comments on commit 73d06e3

Please sign in to comment.