From 713d575badbd8c4ad8f645a10950da4249fb9371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Tue, 16 Feb 2021 21:02:13 -0800 Subject: [PATCH] Update CI check for Go 1.16 --- .github/workflows/ci.yml | 6 +++--- Makefile | 6 +++++- go.mod | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eea73891..ac55399f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Checkout @@ -42,7 +42,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - go-version: [1.14, 1.15] + go-version: [1.16] steps: - name: Set up Go uses: actions/setup-go@v1 @@ -76,7 +76,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Checkout diff --git a/Makefile b/Makefile index 32eeb12e..2084cc41 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ export PGPASSWORD := postgres linux-armv5 \ linux-x86 \ darwin-amd64 \ + darwin-arm64 \ freebsd-amd64 \ freebsd-x86 \ openbsd-amd64 \ @@ -64,6 +65,9 @@ linux-armv5: generate darwin-amd64: generate @ GOOS=darwin GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-darwin-amd64 main.go +darwin-arm64: generate + @ GOOS=darwin GOARCH=arm64 go build -ldflags=$(LD_FLAGS) -o $(APP)-darwin-arm64 main.go + freebsd-amd64: generate @ GOOS=freebsd GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-freebsd-amd64 main.go @@ -73,7 +77,7 @@ openbsd-amd64: generate windows-amd64: generate @ GOOS=windows GOARCH=amd64 go build -ldflags=$(LD_FLAGS) -o $(APP)-windows-amd64 main.go -build: linux-amd64 linux-arm64 linux-armv7 linux-armv6 linux-armv5 darwin-amd64 freebsd-amd64 openbsd-amd64 windows-amd64 +build: linux-amd64 linux-arm64 linux-armv7 linux-armv6 linux-armv5 darwin-amd64 darwin-arm64 freebsd-amd64 openbsd-amd64 windows-amd64 # NOTE: unsupported targets netbsd-amd64: generate diff --git a/go.mod b/go.mod index 22fe82c8..808368e0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module miniflux.app -// +heroku goVersion go1.15 +// +heroku goVersion go1.16 require ( github.com/PuerkitoBio/goquery v1.6.1 @@ -24,4 +24,4 @@ require ( mvdan.cc/xurls/v2 v2.2.0 ) -go 1.15 +go 1.16