Skip to content

Commit 41211af

Browse files
committed
vet should be part of build and test, remove extra test in GHA
1 parent 377c243 commit 41211af

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

.github/workflows/build-test.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Test
1+
name: Build
22
on:
33
push:
44
branches:
@@ -11,7 +11,7 @@ permissions:
1111
actions: read
1212

1313
concurrency:
14-
group: build-test-${{ github.event.pull_request.number || github.ref_name }}
14+
group: build-${{ github.event.pull_request.number || github.ref_name }}
1515
cancel-in-progress: true
1616

1717
jobs:
@@ -60,29 +60,24 @@ jobs:
6060
ingest.codecov.io:443
6161
get.helm.sh:443
6262
golangci-lint.run:443
63+
dl.k8s.io:443
64+
cdn.dl.k8s.io:443
6365
6466
- uses: actions/checkout@v5
6567
with:
6668
fetch-depth: 0
69+
6770
- uses: actions/setup-go@v6
6871
with:
6972
go-version-file: go.mod
7073
check-latest: true
7174

72-
- name: Vet
73-
run: make vet
74-
75-
- name: lint
76-
uses: golangci/golangci-lint-action@v8
77-
with:
78-
version: v2.1.5
75+
- name: Lint
76+
run: make lint
7977

8078
- name: Helm Lint
8179
run: make helm-lint
8280

83-
- name: Test
84-
run: make test
85-
8681
- name: Build
8782
run: make build
8883

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,13 @@ jobs:
6060
cli.codecov.io:443
6161
api.codecov.io:443
6262
ingest.codecov.io:443
63+
dl.k8s.io:443
64+
cdn.dl.k8s.io:443
6365
6466
- uses: actions/checkout@v5
6567
with:
6668
ref: ${{ github.event.pull_request.head.sha }}
69+
6770
- uses: actions/setup-go@v6
6871
with:
6972
go-version-file: go.mod

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,22 @@ codegen:
101101

102102
.PHONY: test
103103
# we say code is not worth testing unless it's formatted
104-
test: fmt codegen
104+
test: fmt codegen vet
105105
go test -v -coverpkg=./sentry,./cloud/linode/client,./cloud/linode,./cloud/linode/utils,./cloud/linode/services,./cloud/nodeipam,./cloud/nodeipam/ipam -coverprofile ./coverage.out -cover ./sentry/... ./cloud/... $(TEST_ARGS)
106106

107107
## --------------------------------------
108108
## Build
109109
## --------------------------------------
110110

111111
.PHONY: build-linux
112-
build-linux: codegen
112+
build-linux: codegen fmt vet
113113
echo "cross compiling linode-cloud-controller-manager for linux/amd64" && \
114114
GOOS=linux GOARCH=amd64 \
115115
CGO_ENABLED=0 \
116116
go build -o dist/linode-cloud-controller-manager-linux-amd64 .
117117

118118
.PHONY: build
119-
build: codegen
119+
build: codegen fmt vet
120120
echo "compiling linode-cloud-controller-manager" && \
121121
CGO_ENABLED=0 \
122122
go build -o dist/linode-cloud-controller-manager .

0 commit comments

Comments
 (0)