github/workflows: fix branch name and refactoring workflows (#145)

zchee · web-flow · commit 96e3717ecab7 · 2022-09-16T04:48:58.000+09:00
* github/workflows: fix branch name and refactoring workflows

* nvim: fix testcase for v0.7.2
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -14,35 +14,27 @@ defaults:
 
 jobs:
   benchmark:
-    strategy:
-      matrix:
-        os:
-          - ubuntu-22.04  # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
-        go-version:
-          - 1.19.x
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04  # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
 
     steps:
     - name: Set flag environment variable
       run: |
         echo "OS=$(echo ${{ runner.os }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
         echo "GO_VERSION=$(echo ${{ matrix.go-version }} | cut -d. -f-2)" >> $GITHUB_ENV
 
+    - name: Checkout code
+      uses: actions/checkout@v3
+
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ matrix.go-version }}
-
-    - name: Checkout code
-      uses: actions/checkout@v3
+        go-version: '1.19.x'
 
     - name: Install nvim binary
       uses: rhysd/action-setup-vim@v1
-      if: steps.cache-nvim.outputs.cache-hit != 'true'
       with:
         neovim: true
-        version: v0.7.0
+        version: v0.7.2
 
     - name: Run Benchmark
       run: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -3,35 +3,38 @@ name: "CodeQL"
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
-    branches:
-      - master
   schedule:
     - cron: '0 20 * * *'
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: 
-      - ubuntu-22.04  # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
+    runs-on: ubuntu-22.04  # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
 
     permissions:
       actions: read
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.19.x'
+
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: 'go'
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
+      env:
+        # hack for fetch dependencies when failed to go-autobuilder 'make' command
+        # https://github.com/github/codeql-go/blob/b953fe39c2cb/extractor/cli/go-autobuilder/go-autobuilder.go#L409
+        CODEQL_EXTRACTOR_GO_BUILD_COMMAND: 'true'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,10 +3,8 @@ name: Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
-    branches:
-      - master
   release:
     types:
       - published
@@ -30,7 +28,7 @@ jobs:
           - 1.18.x
           - 1.19.x
         neovim-version:
-          - v0.7.0
+          - v0.7.2
           - nightly
       fail-fast: false
 
@@ -57,11 +55,6 @@ jobs:
         neovim: true
         version: ${{ matrix.neovim-version }}
 
-    - name: gofmt
-      if: matrix.go-version == '1.19.x' && env.OS != 'windows'
-      run: |
-        diff -u <(echo -n) <(gofmt -s -d .)
-
     - name: go vet
       run: |
         go vet ./...
diff --git a/nvim/api_test.go b/nvim/api_test.go
@@ -59,24 +59,24 @@ func parseVersion(tb testing.TB, version string) (major, minor, patch int64) {
 	return major, minor, patch
 }
 
-func isSkipVersion(tb testing.TB, version string) bool {
+func versionIs(tb testing.TB, version string) bool {
 	major, minor, patch := parseVersion(tb, version)
-	if nvimVersion.Major < major || nvimVersion.Minor < minor || nvimVersion.Patch < patch {
+	if nvimVersion.Major <= major && nvimVersion.Minor <= minor && nvimVersion.Patch <= patch {
 		return true
 	}
 
 	return false
 }
 
 func skipVersion(tb testing.TB, version string) {
-	if isSkipVersion(tb, version) {
+	if versionIs(tb, version) {
 		const skipFmt = "run this test %s or higher neovim version: current neovim version %s"
 		tb.Skipf(skipFmt, version, nvimVersion)
 	}
 }
 
 func skipBetweenVersion(tb testing.TB, low, high string) {
-	if isSkipVersion(tb, low) || !isSkipVersion(tb, high) {
+	if versionIs(tb, low) || versionIs(tb, high) {
 		const skipFmt = "run this test between %s to %s neovim version: current version: %s"
 		tb.Skipf(skipFmt, low, high, nvimVersion)
 	}
@@ -1137,7 +1137,7 @@ func testWindow(v *Nvim) func(*testing.T) {
 			}
 
 			t.Run("WindowBuffer", func(t *testing.T) {
-				skipVersion(t, "v0.6.0")
+				skipVersion(t, "v0.7.0")
 
 				gotBuf, err := v.WindowBuffer(Window(0))
 				if err != nil {
@@ -1374,7 +1374,7 @@ func testWindow(v *Nvim) func(*testing.T) {
 			}
 
 			t.Run("WindowBuffer", func(t *testing.T) {
-				skipVersion(t, "v0.6.0")
+				skipVersion(t, "v0.7.0")
 
 				b := v.NewBatch()
 
@@ -2190,7 +2190,7 @@ func testCommand(v *Nvim) func(*testing.T) {
 			}
 			for name, tt := range tests {
 				t.Run(path.Join(name, "Nvim"), func(t *testing.T) {
-					skipVersion(t, "v0.7.0")
+					skipVersion(t, "v0.8.0")
 
 					if err := v.CreateUserCommand(tt.name, tt.command, tt.opts); err != nil {
 						t.Fatal(err)
@@ -2211,7 +2211,7 @@ func testCommand(v *Nvim) func(*testing.T) {
 				})
 
 				t.Run(path.Join(name, "Batch"), func(t *testing.T) {
-					skipVersion(t, "v0.7.0")
+					skipVersion(t, "v0.8.0")
 
 					b := v.NewBatch()
 
@@ -2256,7 +2256,7 @@ func testCommand(v *Nvim) func(*testing.T) {
 			}
 			for name, tt := range tests {
 				t.Run(path.Join(name, "Nvim"), func(t *testing.T) {
-					skipVersion(t, "v0.7.0")
+					skipVersion(t, "v0.8.0")
 
 					if err := v.CreateBufferUserCommand(Buffer(0), tt.name, tt.command, tt.opts); err != nil {
 						t.Fatal(err)
@@ -2277,7 +2277,7 @@ func testCommand(v *Nvim) func(*testing.T) {
 				})
 
 				t.Run(path.Join(name, "Batch"), func(t *testing.T) {
-					skipVersion(t, "v0.7.0")
+					skipVersion(t, "v0.8.0")
 
 					b := v.NewBatch()
 
@@ -2867,7 +2867,7 @@ func testKey(v *Nvim) func(*testing.T) {
 			})
 
 			t.Run("KeyMap", func(t *testing.T) {
-				skipBetweenVersion(t, "v0.6.0", "v0.8.0")
+				skipBetweenVersion(t, "v0.7.0", "v0.8.0")
 
 				mode := "n"
 				if err := v.SetKeyMap(mode, "y", "yy", make(map[string]bool)); err != nil {
@@ -3209,7 +3209,7 @@ func testKey(v *Nvim) func(*testing.T) {
 			})
 
 			t.Run("KeyMap", func(t *testing.T) {
-				skipBetweenVersion(t, "v0.6.0", "v0.8.0")
+				skipBetweenVersion(t, "v0.7.0", "v0.8.0")
 
 				b := v.NewBatch()
 
@@ -4742,7 +4742,7 @@ func testOptions(v *Nvim) func(*testing.T) {
 			for name, tt := range tests {
 				t.Run("Nvim/"+name, func(t *testing.T) {
 					if name == "hidden" {
-						skipVersion(t, "v0.6.0")
+						skipVersion(t, "v0.7.0")
 					}
 
 					got, err := v.OptionInfo(tt.name)
@@ -4758,7 +4758,7 @@ func testOptions(v *Nvim) func(*testing.T) {
 			for name, tt := range tests {
 				t.Run("Batch/"+name, func(t *testing.T) {
 					if name == "hidden" {
-						skipVersion(t, "v0.6.0")
+						skipVersion(t, "v0.7.0")
 					}
 
 					b := v.NewBatch()
@@ -4876,7 +4876,7 @@ func testOptionsInfo(v *Nvim) func(*testing.T) {
 		for name, tt := range tests {
 			t.Run("Nvim/"+name, func(t *testing.T) {
 				if name == "hidden" {
-					skipVersion(t, "v0.6.0")
+					skipVersion(t, "v0.7.0")
 				}
 
 				got, err := v.OptionInfo(tt.name)
@@ -4892,7 +4892,7 @@ func testOptionsInfo(v *Nvim) func(*testing.T) {
 		for name, tt := range tests {
 			t.Run("Batch/"+name, func(t *testing.T) {
 				if name == "hidden" {
-					skipVersion(t, "v0.6.0")
+					skipVersion(t, "v0.7.0")
 				}
 
 				b := v.NewBatch()
@@ -4937,7 +4937,7 @@ func testOptionsValue(v *Nvim) func(*testing.T) {
 		}
 		for name, tt := range tests {
 			t.Run(path.Join(name, "Nvim"), func(t *testing.T) {
-				skipVersion(t, "v0.7.0")
+				skipVersion(t, "v0.8.0")
 
 				var result interface{}
 				if err := v.OptionValue(tt.name, tt.opts, &result); err != nil {
@@ -4967,7 +4967,7 @@ func testOptionsValue(v *Nvim) func(*testing.T) {
 
 		for name, tt := range tests {
 			t.Run(path.Join(name, "Batch"), func(t *testing.T) {
-				skipVersion(t, "v0.7.0")
+				skipVersion(t, "v0.8.0")
 
 				b := v.NewBatch()
 
@@ -5669,19 +5669,15 @@ func testAutocmd(v *Nvim) func(*testing.T) {
 					{
 						ID:       0,
 						Group:    augID,
-						Desc:     `<vim function: echomsg 'Hello Autocmd'>`,
 						Event:    `User`,
-						Command:  `<vim function: echomsg 'Hello Autocmd'>`,
 						Once:     false,
 						Pattern:  `AutocmdTest`,
 						BufLocal: false,
 						Buffer:   0,
 					},
 				}
-				switch nvimVersion.Minor {
-				case 8:
-					want[0].Desc = ""
-					want[0].Command = ""
+				if versionIs(t, "v0.7.2") {
+					want[0].Command = `<vim function: echomsg 'Hello Autocmd'>`
 				}
 
 				args := map[string]interface{}{
@@ -5783,19 +5779,15 @@ func testAutocmd(v *Nvim) func(*testing.T) {
 					{
 						ID:       0,
 						Group:    augID,
-						Desc:     `<vim function: echomsg 'Hello Autocmd'>`,
 						Event:    `User`,
-						Command:  `<vim function: echomsg 'Hello Autocmd'>`,
 						Once:     false,
 						Pattern:  `AutocmdTest`,
 						BufLocal: false,
 						Buffer:   0,
 					},
 				}
-				switch nvimVersion.Minor {
-				case 8:
-					want[0].Desc = ""
-					want[0].Command = ""
+				if versionIs(t, "v0.7.2") {
+					want[0].Command = `<vim function: echomsg 'Hello Autocmd'>`
 				}
 
 				args := map[string]interface{}{
