From 02184245f652d50c6f35a4f09b940619ab634835 Mon Sep 17 00:00:00 2001 From: Gabriel Sanches Date: Sat, 14 Sep 2019 14:54:53 -0300 Subject: [PATCH] Lint and test package in Go 1.13 This also updates Mage to the latest version, which contains a bug fix that prevented it to work with Go 1.13. Linting is now done using both Go 1.12 and 1.13, in order to guarantee that all files, independently of build tags, are linted. --- .github/workflows/main.yml | 13 ++++++++----- go.mod | 2 +- go.sum | 2 ++ tools/magefile.go => magefile.go | 0 4 files changed, 11 insertions(+), 6 deletions(-) rename tools/magefile.go => magefile.go (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3a2627..c367da4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,6 +2,9 @@ name: 'Linux, macOS and Windows' on: [push, pull_request] jobs: lint: + strategy: + matrix: + go: ['1.12', '1.13'] runs-on: ubuntu-latest steps: - name: Checkout @@ -9,21 +12,21 @@ jobs: - name: Set up Go 1.12 uses: actions/setup-go@v1 with: - go-version: '1.12' + go-version: ${{ matrix.os }} - name: Lint source code env: MAGEFILE_VERBOSE: true run: | GOBIN="$(pwd)/bin" go install github.com/magefile/mage - ./bin/mage -d tools install - ./bin/mage -d tools lint + ./bin/mage install + ./bin/mage lint test: needs: lint strategy: matrix: os: [macOS-latest, ubuntu-latest, windows-latest] - go: ['1.11', '1.12'] + go: ['1.11', '1.12', '1.13'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v1 @@ -38,4 +41,4 @@ jobs: shell: bash run: | GOBIN="$(pwd)/bin" go install github.com/magefile/mage - ./bin/mage -d tools test + ./bin/mage test diff --git a/go.mod b/go.mod index b5e1e47..1faecd4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/gbrlsnchs/jwt/v3 go 1.10 require ( - github.com/magefile/mage v1.8.0 + github.com/magefile/mage v1.9.0 golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 golang.org/x/lint v0.0.0-20190409202823-959b441ac422 golang.org/x/tools v0.0.0-20190710153321-831012c29e42 diff --git a/go.sum b/go.sum index 884cbf9..b4cfa35 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/magefile/mage v1.8.0 h1:mzL+xIopvPURVBwHG9A50JcjBO+xV3b5iZ7khFRI+5E= github.com/magefile/mage v1.8.0/go.mod h1:IUDi13rsHje59lecXokTfGX0QIzO45uVPlXnJYsXepA= +github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE= +github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM= diff --git a/tools/magefile.go b/magefile.go similarity index 100% rename from tools/magefile.go rename to magefile.go