.github: use go 1.21 and 1.22

9fans · Apr 6, 2024 · 90b2f51 · 90b2f51
1 parent b573109
commit 90b2f51
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.21.x, 1.22.x]
         platform: [ubuntu-latest]
       fail-fast: false
     runs-on: ${{ matrix.platform }}

diff --git a/cmd/L/main.go b/cmd/L/main.go
@@ -12,13 +12,13 @@ import (
 	"path/filepath"
 	"strconv"
 
-	p9client "github.com/fhs/9fans-go/plan9/client"
 	"9fans.net/acme-lsp/internal/lsp"
 	"9fans.net/acme-lsp/internal/lsp/acmelsp"
 	"9fans.net/acme-lsp/internal/lsp/acmelsp/config"
 	"9fans.net/acme-lsp/internal/lsp/cmd"
 	"9fans.net/acme-lsp/internal/lsp/proxy"
 	"9fans.net/internal/go-lsp/lsp/protocol"
+	p9client "github.com/fhs/9fans-go/plan9/client"
 	"github.com/sourcegraph/jsonrpc2"
 )
 

diff --git a/cmd/acmefocused/main.go b/cmd/acmefocused/main.go
@@ -24,9 +24,9 @@ import (
 	"path/filepath"
 	"sync"
 
+	"9fans.net/acme-lsp/internal/p9service"
 	"github.com/fhs/9fans-go/acme"
 	"github.com/fhs/9fans-go/plan9/client"
-	"9fans.net/acme-lsp/internal/p9service"
 )
 
 func main() {

diff --git a/internal/lsp/acmelsp/acmelsp.go b/internal/lsp/acmelsp/acmelsp.go
@@ -12,14 +12,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/fhs/9fans-go/plan9"
-	"github.com/fhs/9fans-go/plumb"
 	"9fans.net/acme-lsp/internal/acme"
 	"9fans.net/acme-lsp/internal/acmeutil"
 	"9fans.net/acme-lsp/internal/lsp"
 	"9fans.net/acme-lsp/internal/lsp/proxy"
 	"9fans.net/acme-lsp/internal/lsp/text"
 	"9fans.net/internal/go-lsp/lsp/protocol"
+	"github.com/fhs/9fans-go/plan9"
+	"github.com/fhs/9fans-go/plumb"
 )
 
 func CurrentWindowRemoteCmd(ss *ServerSet, fm *FileManager) (*RemoteCmd, error) {

diff --git a/internal/lsp/acmelsp/acmelsp_test.go b/internal/lsp/acmelsp/acmelsp_test.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/fhs/9fans-go/plumb"
 	"9fans.net/acme-lsp/internal/lsp"
 	"9fans.net/acme-lsp/internal/lsp/acmelsp/config"
 	"9fans.net/internal/go-lsp/lsp/protocol"
+	"github.com/fhs/9fans-go/plumb"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/internal/lsp/acmelsp/config/config.go b/internal/lsp/acmelsp/config/config.go
@@ -12,9 +12,9 @@ import (
 	"runtime"
 	"strings"
 
+	"9fans.net/internal/go-lsp/lsp/protocol"
 	"github.com/BurntSushi/toml"
 	"github.com/fhs/9fans-go/plan9/client"
-	"9fans.net/internal/go-lsp/lsp/protocol"
 )
 
 // Flags represent a set of command line flags.