Skip to content

Commit b898d2f

Browse files
authored
Merge pull request #1415 from mitch292/mitch292/go-version
Update repository to reflect required min go version of 1.20
2 parents 6d2d0b2 + a40f86c commit b898d2f

File tree

4 files changed

+10
-32
lines changed

4 files changed

+10
-32
lines changed

.github/workflows/go.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
# starting with go 1.24 the GODEBUG=x509sha1=1 flag has been removed.
13+
# starting with go 1.24 the GODEBUG=x509sha1=1 flag has been removed.
1414
# many tests rely on sha1 certificates. After resolving #1413 we can
15-
# run these on stable and old stable again.
16-
go: ['1.23', '1.22']
15+
# run these on stable and oldstable again. Min version (1.20) can
16+
# always be run.
17+
go: ['1.23', '1.22', '1.20']
1718
services:
1819
# Label used to access the service container
1920
postgres:
@@ -76,7 +77,7 @@ jobs:
7677
- uses: actions/checkout@v4
7778
- uses: actions/setup-go@v5
7879
with:
79-
go-version: 1.18
80+
go-version: "1.20"
8081
- name: golangci-lint
8182
uses: golangci/golangci-lint-action@v6
8283
with:

Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16.15-alpine3.15@sha256:9743f230f26d1e300545f0330fd4a514f554c535d967563ee77bf634906502b6 as builder
1+
FROM golang:1.20-alpine AS builder
22

33
WORKDIR /workdir
44
COPY . /workdir

README.md

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
CFSSL is CloudFlare's PKI/TLS swiss army knife. It is both a command line
1010
tool and an HTTP API server for signing, verifying, and bundling TLS
11-
certificates. It requires Go 1.16+ to build.
11+
certificates. It requires Go 1.20+ to build.
1212

1313
Note that certain linux distributions have certain algorithms removed
1414
(RHEL-based distributions in particular), so the golang from the
@@ -30,7 +30,7 @@ CFSSL consists of:
3030
### Building
3131

3232
Building cfssl requires a
33-
[working Go 1.16+ installation](http://golang.org/doc/install).
33+
[working Go 1.20+ installation](http://golang.org/doc/install).
3434

3535
```
3636
$ git clone [email protected]:cloudflare/cfssl.git
@@ -61,32 +61,9 @@ You can set the `GOOS` and `GOARCH` environment variables to have Go cross compi
6161

6262
### Installation
6363

64-
Installation requires a [working Go 1.16+ installation](http://golang.org/doc/install).
64+
Installation requires a [working Go 1.20+ installation](http://golang.org/doc/install).
6565
Alternatively, [prebuilt binaries are available](https://github.com/cloudflare/cfssl/releases)
6666

67-
```
68-
$ go get github.com/cloudflare/cfssl/cmd/cfssl
69-
```
70-
71-
will download, build, and install the CFSSL tool.
72-
73-
To install any of the other utility programs that are
74-
in this repo (for instance `cfssljson` in this case):
75-
76-
```
77-
$ go get github.com/cloudflare/cfssl/cmd/cfssljson
78-
```
79-
80-
This will download, build, and install the CFSSLJSON tool.
81-
82-
And to simply install __all__ of the programs in this repo:
83-
84-
```
85-
$ go get github.com/cloudflare/cfssl/cmd/...
86-
```
87-
88-
if you are above go 1.18:
89-
9067
```
9168
$ go install github.com/cloudflare/cfssl/cmd/...@latest
9269
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cloudflare/cfssl
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c

0 commit comments

Comments
 (0)