diff options
| author | Joseph Richey <joerichey@google.com> | 2022-04-08 16:23:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 16:23:54 -0700 |
| commit | 896549fa52002a65436625ad4fd7743b444f1135 (patch) | |
| tree | bdc0134d83ac36aa3c2ff99a6a7e23a27a049ee7 | |
| parent | f28f2be05de938b1c2da7a88569bf6611250a9e2 (diff) | |
| parent | 657a1f0f44b61725f1b8041bceef6f262ffcb770 (diff) | |
Merge pull request #353 from google/go-version
Bump up required Go version to 1.16
| -rw-r--r-- | .github/workflows/ci.yml | 5 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | go.mod | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdd3021..a10d117 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: build: strategy: matrix: - go: ['1.14', '1.13', '1.12', '1.11'] + go: ['1.18', '1.17', '1.16'] name: Build (Go ${{ matrix.go }}) runs-on: ubuntu-latest steps: @@ -40,7 +40,7 @@ jobs: sudo apt-get update sudo apt-get install -y libpam0g-dev - name: Build - run: GO111MODULE=on make + run: make build-32bit: name: Build (32-bit) @@ -97,7 +97,6 @@ jobs: # apt-get install -y build-essential git sudo golang-go \ # libpam0g-dev e2fsprogs keyutils # run: | - # export GO111MODULE=on # make test-setup # keyctl link @u @s # make test @@ -72,8 +72,6 @@ VERSION_FLAG := -X "main.version=$(if $(TAG_VERSION),$(TAG_VERSION),$(VERSION))" override GO_LINK_FLAGS += $(VERSION_FLAG) -extldflags "$(LDFLAGS)" override GO_FLAGS += --ldflags '$(GO_LINK_FLAGS)' -# Always use Go modules -export GO111MODULE = on # Use -trimpath if available ifneq "" "$(shell go help build | grep trimpath)" override GO_FLAGS += -trimpath @@ -215,7 +215,7 @@ information about each of the commands. ## Building and installing `fscrypt` has a minimal set of build dependencies: -* [Go](https://golang.org/doc/install) 1.11 or higher. Older versions may work +* [Go](https://golang.org/doc/install) 1.16 or higher. Older versions may work but they are not tested or supported. * A C compiler (`gcc` or `clang`) * `make` @@ -1,6 +1,6 @@ module github.com/google/fscrypt -go 1.11 +go 1.16 require ( github.com/client9/misspell v0.3.4 |