Skip to content

Commit 779b58b

Browse files
authored
Merge pull request #2 from openvex/updates
Updates on ci, license headers and drop release job
2 parents 2d2b6ef + dc1b0dc commit 779b58b

File tree

6 files changed

+30
-148
lines changed

6 files changed

+30
-148
lines changed

.github/workflows/boilerplate.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ name: Boilerplate
55

66
on:
77
pull_request:
8-
branches: [ 'main', 'release-*' ]
8+
branches:
9+
- 'main'
10+
- 'release-*'
911

1012
jobs:
1113

@@ -16,24 +18,24 @@ jobs:
1618
fail-fast: false # Keep running if one leg fails.
1719
matrix:
1820
extension:
19-
- go
20-
- sh
21-
- yaml
21+
- go
22+
- sh
23+
- yaml
2224

2325
# Map between extension and human-readable name.
2426
include:
25-
- extension: go
26-
language: Go
27-
- extension: sh
28-
language: Bash
29-
- extension: yaml
30-
language: YAML
31-
- extension: yml
32-
language: YAML
27+
- extension: go
28+
language: Go
29+
- extension: sh
30+
language: Bash
31+
- extension: yaml
32+
language: YAML
33+
- extension: yml
34+
language: YAML
3335

3436
steps:
3537
- name: Check out code
36-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
38+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
3739

3840
- uses: chainguard-dev/actions/boilerplate@main
3941
with:

.github/workflows/ci-build-test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v2.4.0
18+
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
1919

20-
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v2.2.0
20+
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
2121
with:
2222
go-version: '1.19'
2323
check-latest: true
2424
cache: true
2525

2626
- name: build
27-
run: make vex
27+
run: make pkg
2828

2929
test:
3030
name: test
3131
runs-on: ubuntu-latest
3232

3333
steps:
34-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v2.4.0
34+
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
3535

36-
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v2.2.0
36+
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
3737
with:
3838
go-version: '1.19'
3939
check-latest: true

.github/workflows/release.yaml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/workflows/verify.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ on:
66
- "main"
77
pull_request:
88

9-
permissions: read-all
9+
permissions: {}
1010

1111
jobs:
1212
golangci:
1313
name: golangci-lint
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
17-
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3
16+
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
17+
- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
1818
with:
1919
go-version: 1.19
2020
check-latest: true
2121
cache: true
22+
2223
- name: golangci-lint
23-
uses: golangci/golangci-lint-action@0ad9a0988b3973e851ab0a07adf248ec2e100376 # v3
24+
uses: golangci/golangci-lint-action@0ad9a0988b3973e851ab0a07adf248ec2e100376 # v3.3.1
2425
with:
25-
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
26-
version: v1.49
26+
version: v1.50.1
2727
args: --timeout=5m

.goreleaser.yaml

Lines changed: 0 additions & 77 deletions
This file was deleted.

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ LDFLAGS=-buildid= -X sigs.k8s.io/release-utils/version.gitVersion=$(GIT_VERSION)
2727
-X sigs.k8s.io/release-utils/version.gitCommit=$(GIT_HASH) \
2828
-X sigs.k8s.io/release-utils/version.gitTreeState=$(GIT_TREESTATE) \
2929
-X sigs.k8s.io/release-utils/version.buildDate=$(BUILD_DATE)
30+
3031
## Build
31-
.PHONY: vex
32-
vex: # build the binaries
33-
go build -trimpath -ldflags "$(LDFLAGS)" -o vexctl ./main.go
32+
.PHONY: pkg
33+
pkg: ## Build pkg
34+
go build -trimpath -ldflags "$(LDFLAGS)" ./...
3435

3536
## Tests
3637
.PHONY: test

0 commit comments

Comments
 (0)