Skip to content

Commit

Permalink
Merge pull request direnv#779 from wingrunr21/go_1_16
Browse files Browse the repository at this point in the history
Go 1.16 and Apple Silicon support
  • Loading branch information
zimbatm authored Mar 12, 2021
2 parents a4049b0 + 92f833f commit f11d2ff
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Go
uses: actions/[email protected]
with:
go-version: 1.15.5
go-version: 1.16
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
name: Create Release
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.13.6
- name: Set up Go 1.16
uses: actions/[email protected]
with:
go-version: 1.13.6
go-version: 1.16
- name: Checkout code
uses: actions/[email protected]
- name: Get release notes
Expand Down
1 change: 1 addition & 0 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ dist:
@command -v gox >/dev/null || (echo "Could not generate dist because gox is missing. Run: go get -u github.com/mitchellh/gox"; false)
CGO_ENABLED=0 gox -output "$(DISTDIR)/direnv.{{.OS}}-{{.Arch}}" \
-osarch darwin/amd64 \
-osarch darwin/arm64 \
-osarch freebsd/386 \
-osarch freebsd/amd64 \
-osarch freebsd/arm \
Expand Down
2 changes: 1 addition & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Setup a go environment https://golang.org/doc/install

> go >= 1.15 is required
> go >= 1.16 is required
Clone the project:

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/direnv/direnv/v2

go 1.15
go 1.16

require (
github.com/BurntSushi/toml v0.3.1
Expand Down

0 comments on commit f11d2ff

Please sign in to comment.