Skip to content
This repository was archived by the owner on Aug 8, 2025. It is now read-only.

Commit c8aa57b

Browse files
committed
Fix for errors in git action workflows
1 parent 2d93401 commit c8aa57b

File tree

10 files changed

+116
-238
lines changed

10 files changed

+116
-238
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- uses: actions/setup-go@v3
1010
with:
11-
go-version: 1.19
11+
go-version: 1.20
1212
- uses: actions/checkout@v3
1313
- name: golangci-lint
1414
uses: golangci/golangci-lint-action@v3

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
name: Set up Go
1818
uses: actions/setup-go@v3
1919
with:
20-
go-version: 1.19
20+
go-version: 1.20
2121
-
2222
name: golangci-lint
2323
uses: golangci/golangci-lint-action@v3
2424
with:
25-
version: v1.45
25+
version: v1.50.1
2626
args: --issues-exit-code=1
2727
-
2828
name: Import GPG key

.github/workflows/website-lint.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ on:
77
branches: [ "main" ]
88

99
jobs:
10-
11-
build:
10+
website-lint:
1211
runs-on: ubuntu-latest
1312
steps:
1413
- uses: actions/checkout@v3
1514

1615
- name: Set up Go
1716
uses: actions/setup-go@v3
1817
with:
19-
go-version: 1.19
18+
go-version: 1.20
2019

2120
- name: Install tools
2221
run: make tools

.goreleaser.yml

Lines changed: 51 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,60 @@
1-
# This is an example .goreleaser.yml file with some sensible defaults.
2-
# Make sure to check the documentation at https://goreleaser.com
1+
# Visit https://goreleaser.com for documentation on how to customize this
2+
# behavior.
33
before:
44
hooks:
5-
# You may remove this if you don't use go modules.
5+
# this is just an example and not a requirement for provider building/publishing
66
- go mod tidy
7-
# you may remove this if you don't need go generate
8-
- go generate ./...
97
builds:
10-
- env:
11-
- CGO_ENABLED=0
12-
goos:
13-
- linux
14-
- windows
15-
- darwin
16-
8+
- env:
9+
# goreleaser does not work with CGO, it could also complicate
10+
# usage by users in CI/CD systems like Terraform Cloud where
11+
# they are unable to install libraries.
12+
- CGO_ENABLED=0
13+
mod_timestamp: '{{ .CommitTimestamp }}'
14+
flags:
15+
- -trimpath
16+
ldflags:
17+
- '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
18+
goos:
19+
- freebsd
20+
- windows
21+
- linux
22+
- darwin
23+
goarch:
24+
- amd64
25+
- '386'
26+
- arm
27+
- arm64
28+
ignore:
29+
- goos: darwin
30+
goarch: '386'
31+
binary: '{{ .ProjectName }}_v{{ .Version }}'
1732
archives:
18-
- format: tar.gz
19-
# this name template makes the OS and Arch compatible with the results of uname.
20-
name_template: >-
21-
{{ .ProjectName }}_
22-
{{- title .Os }}_
23-
{{- if eq .Arch "amd64" }}x86_64
24-
{{- else if eq .Arch "386" }}i386
25-
{{- else }}{{ .Arch }}{{ end }}
26-
{{- if .Arm }}v{{ .Arm }}{{ end }}
27-
# use zip for windows archives
28-
format_overrides:
29-
- goos: windows
30-
format: zip
33+
- format: zip
34+
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
3135
checksum:
32-
name_template: 'checksums.txt'
33-
snapshot:
34-
name_template: "{{ incpatch .Version }}-next"
36+
name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
37+
algorithm: sha256
38+
signs:
39+
- artifacts: checksum
40+
args:
41+
# if you are using this is a GitHub action or some other automated pipeline, you
42+
# need to pass the batch flag to indicate its not interactive.
43+
- "--batch"
44+
- "--local-user"
45+
- "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key
46+
- "--output"
47+
- "${signature}"
48+
- "--detach-sign"
49+
- "${artifact}"
50+
release:
51+
# Visit your project's GitHub Releases page to publish this release.
52+
draft: true
3553
changelog:
36-
sort: asc
3754
filters:
3855
exclude:
39-
- '^docs:'
40-
- '^test:'
41-
42-
# The lines beneath this are called `modelines`. See `:help modeline`
43-
# Feel free to remove those if you don't want/use them.
44-
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
45-
# vim: set ts=2 sw=2 tw=0 fo=cnqoj
56+
- '^docs:'
57+
- '^test:'
58+
- Merge pull request
59+
- Merge branch
60+
- go mod tidy

GNUmakefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
TEST?=$$(go list ./...)
22
GOFMT_FILES?=$$(find . -name '*.go')
3+
WEBSITE_REPO=github.com/hashicorp/terraform-website
34
PKG_NAME=nsxt
45
GIT_COMMIT=$$(git rev-list -1 HEAD)
56

@@ -8,6 +9,7 @@ default: build
89
tools:
910
GO111MODULE=on go install -mod=mod github.com/client9/misspell/cmd/misspell
1011
GO111MODULE=on go install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint
12+
GO111MODULE=on go install -mod=mod github.com/katbyte/terrafmt
1113

1214
build: fmtcheck
1315
go install -ldflags "-X github.com/vmware/terraform-provider-for-vmware-nsxt-virtual-private-cloud/nsxt.GitCommit=$(GIT_COMMIT)"
@@ -53,10 +55,19 @@ website-lint:
5355
echo "Unexpected mispelling found in website files."; \
5456
echo "To automatically fix the misspelling, run 'make website-lint-fix' and commit the changes."; \
5557
exit 1)
58+
@terrafmt diff ./website --check --pattern '*.markdown' --quiet || (echo; \
59+
echo "Unexpected differences in website HCL formatting."; \
60+
echo "To see the full differences, run: terrafmt diff ./website --pattern '*.markdown'"; \
61+
echo "To automatically fix the formatting, run 'make website-lint-fix' and commit the changes."; \
62+
exit 1)
5663

5764
website-lint-fix:
5865
@echo "==> Applying automatic website linter fixes..."
5966
@misspell -w -source=text website/
67+
@terrafmt fmt ./website --pattern '*.markdown'
68+
69+
website-list-category:
70+
@find . -name *.markdown | xargs grep subcategory | awk -F '"' '{print $$2}' | sort | uniq
6071

6172
.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website-lint website-lint-fix tools
6273

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ require github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
77
require (
88
github.com/agext/levenshtein v1.2.2 // indirect
99
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
10-
github.com/client9/misspell v0.3.4 // indirect
1110
github.com/davecgh/go-spew v1.1.1 // indirect
1211
github.com/fatih/color v1.15.0 // indirect
1312
github.com/golang/protobuf v1.5.2 // indirect
14-
github.com/golangci/golangci-lint v1.54.2 // indirect
1513
github.com/google/go-cmp v0.5.9 // indirect
1614
github.com/hashicorp/errwrap v1.0.0 // indirect
1715
github.com/hashicorp/go-checkpoint v0.5.0 // indirect

0 commit comments

Comments
 (0)