Merge branch 'main' into get-more-data-from-runtime

AlekSi · web-flow · commit 3e864afaa36d · 2020-11-19T12:29:16.000+03:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
         go-version:
           - 1.13.x
           - 1.14.x
@@ -40,14 +40,29 @@ jobs:
     env:
       # no `-mod=readonly` to test PRs made by @dependabot;
       # `make ci-check-changes` step below still checks what we need
+      WORKDIR: "${{ github.workspace }}/gopath/src/gopkg.in/reform.v1"
+      GOPATH: "${{ github.workspace }}/gopath"
+      GOBIN: "${{ github.workspace }}/gopath/bin"
       GO111MODULE: "on"
-      GOPROXY: https://proxy.golang.org
-      GORACE: halt_on_error=1
-      REFORM_POSTGRES_IMAGE: ${{ matrix.images.postgres }}
-      REFORM_MYSQL_IMAGE: ${{ matrix.images.mysql }}
-      REFORM_MSSQL_IMAGE: ${{ matrix.images.mssql }}
+      GOPROXY: "https://proxy.golang.org"
+      GORACE: "halt_on_error=1"
+      REFORM_POSTGRES_IMAGE: "${{ matrix.images.postgres }}"
+      REFORM_MYSQL_IMAGE: "${{ matrix.images.mysql }}"
+      REFORM_MSSQL_IMAGE: "${{ matrix.images.mssql }}"
 
     steps:
+      # Cache Go modules, build cache, installed packages and GOPATH sources
+      # to significantly decreases total CI time. See also cleanup.yaml.
+      - name: Enable Go cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/go-build
+            ${{ env.GOPATH }}/pkg
+            ${{ env.GOPATH }}/src/github.com
+            ${{ env.GOPATH }}/src/golang.org
+          key: ${{ matrix.os }}-${{ matrix.go-version }}
+
       - name: Set up Go version ${{ matrix.go-version }}
         if: matrix.go-version != 'tip'
         uses: actions/setup-go@v2
@@ -60,43 +75,21 @@ jobs:
           git clone --depth=1 https://go.googlesource.com/go $HOME/gotip
           cd $HOME/gotip/src
           ./make.bash
-          echo "::set-env name=GOROOT::$HOME/gotip"
-          echo "::add-path::$HOME/gotip/bin"
+          echo "GOROOT=$HOME/gotip" >> $GITHUB_ENV
+          echo "$HOME/gotip/bin" >> $GITHUB_PATH
+          echo "$GOBIN" >> $GITHUB_PATH
 
-      - name: Set environment variables
-        run: |
-          echo "::set-env name=GOPATH::$GITHUB_WORKSPACE/gopath"
-          echo "::add-path::$GITHUB_WORKSPACE/gopath/bin"
-          echo "::set-env name=WORKDIR::$GITHUB_WORKSPACE/gopath/src/gopkg.in/reform.v1"
-          echo "::set-env name=GO_VERSION::$(go version)"
+      - name: Set GO_VERSION
+        run: echo "GO_VERSION=$(go version)" >> $GITHUB_ENV
 
       - name: Check out code into GOPATH
         uses: actions/checkout@v2
         with:
           path: ${{ env.WORKDIR }}
 
-      - name: Pull Docker images in the background
+      - name: Pull Docker images
         working-directory: ${{ env.WORKDIR }}
-        run: docker-compose pull --quiet &
-
-      # slightly decreases total CI time; see also cleanup.yaml
-      - name: Enable Go modules cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.GOPATH }}/pkg/mod
-          key: ${{ matrix.os }}-go-${{ matrix.go-version }}-modules-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-modules-
-
-      # significantly decreases total CI time; see also cleanup.yaml
-      - name: Enable Go build cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/go-build
-          key: ${{ matrix.os }}-go-${{ matrix.go-version }}-build-${{ github.ref }}-${{ hashFiles('**') }}
-          restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-build-${{ github.ref }}-
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-build-
+        run: docker-compose pull
 
       - name: Stop Ubuntu services
         run: sudo systemctl stop mysql
@@ -113,7 +106,7 @@ jobs:
       - name: Check that it is still possible to install reform without modules
         working-directory: ${{ env.WORKDIR }}
         run: |
-          env GO111MODULE=off go get -v ./...
+          env GO111MODULE=off go get -v -x ./...
           reform -version
           reform-db -version
 
@@ -131,6 +124,10 @@ jobs:
 
       # TODO test again with updated deps
 
+      - name: Clean Go test cache
+        if: ${{ always() }}
+        run: go clean -testcache
+
       # to ensure that all generators still work the same way
       - name: Check that there are no source code changes
         working-directory: ${{ env.WORKDIR }}
@@ -162,20 +159,38 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
         go-version:
           - 1.15.x
 
     runs-on: ${{ matrix.os }}
 
     env:
-      # no `-mod=readonly` to test PRs made by @dependabot
+      # no `-mod=readonly` to test PRs made by @dependabot;
       # `make ci-check-changes` step below still checks what we need
+      WORKDIR: "${{ github.workspace }}/gopath/src/gopkg.in/reform.v1"
+      GOPATH: "${{ github.workspace }}/gopath"
+      GOBIN: "${{ github.workspace }}/gopath/bin"
       GO111MODULE: "on"
-      GOPROXY: https://proxy.golang.org
-      GORACE: halt_on_error=1
+      GOPROXY: "https://proxy.golang.org"
+      GORACE: "halt_on_error=1"
+      REFORM_POSTGRES_IMAGE: "${{ matrix.images.postgres }}"
+      REFORM_MYSQL_IMAGE: "${{ matrix.images.mysql }}"
+      REFORM_MSSQL_IMAGE: "${{ matrix.images.mssql }}"
 
     steps:
+      # Cache Go modules, build cache, installed packages and GOPATH sources
+      # to significantly decreases total CI time. See also cleanup.yaml.
+      - name: Enable Go cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/go-build
+            ${{ env.GOPATH }}/pkg
+            ${{ env.GOPATH }}/src/github.com
+            ${{ env.GOPATH }}/src/golang.org
+          key: ${{ matrix.os }}-${{ matrix.go-version }}
+
       - name: Set up Go version ${{ matrix.go-version }}
         if: matrix.go-version != 'tip'
         uses: actions/setup-go@v2
@@ -188,40 +203,18 @@ jobs:
           git clone --depth=1 https://go.googlesource.com/go $HOME/gotip
           cd $HOME/gotip/src
           ./make.bash
-          echo "::set-env name=GOROOT::$HOME/gotip"
-          echo "::add-path::$HOME/gotip/bin"
+          echo "GOROOT=$HOME/gotip" >> $GITHUB_ENV
+          echo "$HOME/gotip/bin" >> $GITHUB_PATH
+          echo "$GOBIN" >> $GITHUB_PATH
 
-      - name: Set environment variables
-        run: |
-          echo "::set-env name=GOPATH::$GITHUB_WORKSPACE/gopath"
-          echo "::add-path::$GITHUB_WORKSPACE/gopath/bin"
-          echo "::set-env name=WORKDIR::$GITHUB_WORKSPACE/gopath/src/gopkg.in/reform.v1"
-          echo "::set-env name=GO_VERSION::$(go version)"
+      - name: Set GO_VERSION
+        run: echo "GO_VERSION=$(go version)" >> $GITHUB_ENV
 
       - name: Check out code into GOPATH
         uses: actions/checkout@v2
         with:
           path: ${{ env.WORKDIR }}
 
-      # slightly decreases total CI time; see also cleanup.yaml
-      - name: Enable Go modules cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.GOPATH }}/pkg/mod
-          key: ${{ matrix.os }}-go-${{ matrix.go-version }}-modules-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-modules-
-
-      # significantly decreases total CI time; see also cleanup.yaml
-      - name: Enable Go build cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/go-build
-          key: ${{ matrix.os }}-go-${{ matrix.go-version }}-build-${{ github.ref }}-${{ hashFiles('**') }}
-          restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-build-${{ github.ref }}-
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-build-
-
       # FIXME Is there a more ergonomic way?
       - name: Update Go language version in the module
         working-directory: ${{ env.WORKDIR }}
diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
         go-version:
           - 1.13.x
           - 1.14.x
@@ -24,10 +24,25 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
+      WORKDIR: "${{ github.workspace }}/gopath/src/gopkg.in/reform.v1"
+      GOPATH: "${{ github.workspace }}/gopath"
+      GOBIN: "${{ github.workspace }}/gopath/bin"
       GO111MODULE: "on"
-      GOPROXY: https://proxy.golang.org
+      GOPROXY: "https://proxy.golang.org"
 
     steps:
+      # Cache Go modules, build cache, installed packages and GOPATH sources
+      # to significantly decreases total CI time. See also cleanup.yaml.
+      - name: Enable Go cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/go-build
+            ${{ env.GOPATH }}/pkg
+            ${{ env.GOPATH }}/src/github.com
+            ${{ env.GOPATH }}/src/golang.org
+          key: ${{ matrix.os }}-${{ matrix.go-version }}
+
       - name: Set up Go version ${{ matrix.go-version }}
         if: matrix.go-version != 'tip'
         uses: actions/setup-go@v2
@@ -40,40 +55,17 @@ jobs:
           git clone --depth=1 https://go.googlesource.com/go $HOME/gotip
           cd $HOME/gotip/src
           ./make.bash
-          echo "::set-env name=GOROOT::$HOME/gotip"
-          echo "::add-path::$HOME/gotip/bin"
-
-      - name: Set environment variables
-        run: |
-          echo "::set-env name=GOPATH::$GITHUB_WORKSPACE/gopath"
-          echo "::add-path::$GITHUB_WORKSPACE/gopath/bin"
-          echo "::set-env name=WORKDIR::$GITHUB_WORKSPACE/gopath/src/gopkg.in/reform.v1"
-          echo "::set-env name=GO_VERSION::$(go version)"
+          echo "GOROOT=$HOME/gotip" >> $GITHUB_ENV
+          echo "$HOME/gotip/bin" >> $GITHUB_PATH
+          echo "$GOBIN" >> $GITHUB_PATH
 
       - name: Check out code into GOPATH
         uses: actions/checkout@v2
         with:
           path: ${{ env.WORKDIR }}
 
-      - name: Enable Go modules cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.GOPATH }}/pkg/mod
-          key: ${{ matrix.os }}-go-${{ matrix.go-version }}-modules-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-modules-
-
-      - name: Enable Go build cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/go-build
-          key: ${{ matrix.os }}-go-${{ matrix.go-version }}-build-${{ github.ref }}-${{ hashFiles('**') }}
-          restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-build-${{ github.ref }}-
-            ${{ matrix.os }}-go-${{ matrix.go-version }}-build-
-
-      - name: Clean Go modules cache
-        run: go clean -modcache
-
-      - name: Clean Go build cache
-        run: go clean -cache
+      - name: Clean Go cache
+        run: |
+          go clean -modcache
+          go clean -cache
+          rm -fr ${{ env.GOPATH }}
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/AlekSi/pointer v1.1.0
 	github.com/brianvoe/gofakeit v3.18.0+incompatible
 	github.com/cockroachdb/apd v1.1.0 // indirect
-	github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec
+	github.com/denisenkom/go-mssqldb v0.9.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gofrs/uuid v3.3.0+incompatible // indirect
 	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
@@ -16,4 +16,5 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/stretchr/testify v1.6.1
+	golang.org/x/text v0.3.4 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -8,8 +8,8 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec h1:NfhRXXFDPxcF5Cwo06DzeIaE7uuJtAUhsDwH3LNsjos=
-github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk=
+github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
@@ -41,8 +41,10 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
diff --git a/tools/go.mod b/tools/go.mod
@@ -4,8 +4,8 @@ go 1.13
 
 require (
 	github.com/AlekSi/gocoverutil v0.2.0
-	github.com/golangci/golangci-lint v1.31.0
+	github.com/golangci/golangci-lint v1.32.2
 	github.com/quasilyte/go-consistent v0.0.0-20200404105227-766526bf1e96
-	github.com/reviewdog/reviewdog v0.10.1
-	golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0
+	github.com/reviewdog/reviewdog v0.11.0
+	golang.org/x/tools v0.0.0-20201119054027-25dc3e1ccc3c
 )
diff --git a/tools/go.sum b/tools/go.sum
