github/workflow: drop go1.15 and add go1.18 (#1048)

* github/workflow: drop go1.15 and add go1.18 * all: run goimports
slack-go · Mar 23, 2022 · 93035c9 · 93035c9
1 parent 23e7d3a
commit 93035c9
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 32 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,32 +7,30 @@ on:
   pull_request:
 
 jobs:
-  ci:
-    runs-on: ubuntu-latest
-    name: lint
-    steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: v1.32
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         go:
-          - '1.13'
-          - '1.14'
-          - '1.15'
           - '1.16'
           - '1.17'
+          - '1.18'
     name: test go-${{ matrix.go }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
       - name: run test
         run: go test -v -race ./...
         env:
           GO111MODULE: on
+  lint:
+    runs-on: ubuntu-20.04
+    name: lint
+    steps:
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
diff --git a/examples/workflow_step/handler.go b/examples/workflow_step/handler.go
@@ -3,13 +3,14 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/slack-go/slack"
-	"github.com/slack-go/slack/slackevents"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
 	"time"
+
+	"github.com/slack-go/slack"
+	"github.com/slack-go/slack/slackevents"
 )
 
 const (

diff --git a/examples/workflow_step/main.go b/examples/workflow_step/main.go
@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/slack-go/slack"
 	"log"
 	"net/http"
 	"os"
+
+	"github.com/slack-go/slack"
 )
 
 type (

diff --git a/examples/workflow_step/middleware.go b/examples/workflow_step/middleware.go
@@ -2,9 +2,10 @@ package main
 
 import (
 	"bytes"
-	"github.com/slack-go/slack"
 	"io/ioutil"
 	"net/http"
+
+	"github.com/slack-go/slack"
 )
 
 func (v *SecretsVerifierMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {

diff --git a/slacktest/funcs.go b/slacktest/funcs.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	websocket "github.com/gorilla/websocket"
+
 	slack "github.com/slack-go/slack"
 )
 

diff --git a/slacktest/handlers.go b/slacktest/handlers.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	websocket "github.com/gorilla/websocket"
+
 	slack "github.com/slack-go/slack"
 )
 

diff --git a/slacktest/handlers_test.go b/slacktest/handlers_test.go
@@ -3,8 +3,9 @@ package slacktest
 import (
 	"testing"
 
-	slack "github.com/slack-go/slack"
 	"github.com/stretchr/testify/assert"
+
+	slack "github.com/slack-go/slack"
 )
 
 func TestAuthTestHandler(t *testing.T) {

diff --git a/slacktest/rtm_test.go b/slacktest/rtm_test.go
@@ -4,8 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/slack-go/slack"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/slack-go/slack"
 )
 
 func TestRTMInfo(t *testing.T) {

diff --git a/slacktest/server_test.go b/slacktest/server_test.go
@@ -6,8 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/slack-go/slack"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/slack-go/slack"
 )
 
 func TestDefaultNewServer(t *testing.T) {

diff --git a/socketmode/socket_mode_managed_conn.go b/socketmode/socket_mode_managed_conn.go
@@ -11,13 +11,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/gorilla/websocket"
+
 	"github.com/slack-go/slack"
 	"github.com/slack-go/slack/internal/backoff"
 	"github.com/slack-go/slack/internal/misc"
-	"github.com/slack-go/slack/slackevents"
-
-	"github.com/gorilla/websocket"
 	"github.com/slack-go/slack/internal/timex"
+	"github.com/slack-go/slack/slackevents"
 )
 
 // Run is a blocking function that connects the Slack Socket Mode API and handles all incoming

diff --git a/socketmode/socket_mode_managed_conn_test.go b/socketmode/socket_mode_managed_conn_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 package socketmode

diff --git a/socketmode/socketmode.go b/socketmode/socketmode.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/slack-go/slack"
-
 	"github.com/gorilla/websocket"
+
+	"github.com/slack-go/slack"
 )
 
 // EventType is the type of events that are emitted by scoketmode.Client.

diff --git a/views_test.go b/views_test.go
@@ -6,8 +6,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/slack-go/slack/internal/errorsx"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/slack-go/slack/internal/errorsx"
 )
 
 var dummySlackErr = errorsx.String("dummy_error_from_slack")

diff --git a/websocket_managed_conn.go b/websocket_managed_conn.go
@@ -9,11 +9,11 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/slack-go/slack/internal/backoff"
-	"github.com/slack-go/slack/internal/misc"
-
 	"github.com/gorilla/websocket"
+
+	"github.com/slack-go/slack/internal/backoff"
 	"github.com/slack-go/slack/internal/errorsx"
+	"github.com/slack-go/slack/internal/misc"
 	"github.com/slack-go/slack/internal/timex"
 )
 

diff --git a/websocket_managed_conn_test.go b/websocket_managed_conn_test.go
@@ -8,9 +8,10 @@ import (
 	"time"
 
 	websocket "github.com/gorilla/websocket"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/slack-go/slack"
 	"github.com/slack-go/slack/slacktest"
-	"github.com/stretchr/testify/assert"
 )
 
 const (