aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yml5
-rw-r--r--Makefile2
-rw-r--r--README.md2
-rw-r--r--go.mod2
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
diff --git a/Makefile b/Makefile
index 139f259..b265b02 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/README.md b/README.md
index eff9ecf..e9896fc 100644
--- a/README.md
+++ b/README.md
@@ -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`
diff --git a/go.mod b/go.mod
index d3eadac..ff71171 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/google/fscrypt
-go 1.11
+go 1.16
require (
github.com/client9/misspell v0.3.4