Merge pull request #243 from fwcd/gh-actions

fwcd · web-flow · commit ef0cb3b6dc9f · 2020-12-27T20:48:22.000+01:00
Migrate to GitHub Actions
diff --git a/.editorconfig b/.editorconfig
@@ -8,5 +8,5 @@ indent_style=space
 indent_size=4
 trim_trailing_whitespace=true
 
-[.travis.yml]
+[*.yml]
 indent_size=2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,17 @@
+name: Build
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ['11']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build
+        run: ./gradlew :server:build :shared:build
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,49 @@
+name: Deploy
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Build distribution
+        run: ./gradlew :server:distZip :grammars:distZip
+      - name: Create release
+        uses: actions/create-release@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Version ${{ github.ref }}
+          draft: false
+          prerelease: false
+      - name: Upload server asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./server/build/distributions/server.zip
+          asset_name: server.zip
+          asset_content_type: application/zip
+      - name: Upload grammar asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./grammars/build/distributions/grammars.zip
+          asset_name: grammars.zip
+          asset_content_type: application/zip
+      - name: Deploy Docker image to GitHub Packages
+        run: ./scripts/deploy-docker
+      - name: Deploy Maven artifacts to GitHub Packages
+        run: ./scripts/deploy-maven
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Kotlin Language Server
 [![Release](https://img.shields.io/github/release/fwcd/kotlin-language-server)](https://github.com/fwcd/kotlin-language-server/releases)
-[![Build Status](https://travis-ci.org/fwcd/kotlin-language-server.svg?branch=master)](https://travis-ci.org/fwcd/kotlin-language-server)
+[![Build](https://github.com/fwcd/kotlin-language-server/workflows/Build/badge.svg)](https://github.com/fwcd/kotlin-language-server/actions)
 [![Downloads](https://img.shields.io/github/downloads/fwcd/kotlin-language-server/total)](https://github.com/fwcd/kotlin-language-server/releases)
 [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da)](https://discord.gg/cNtppzN)
 
diff --git a/scripts/deploy-docker b/scripts/deploy-docker
@@ -1,4 +1,4 @@
 #!/bin/bash
-docker login docker.pkg.github.com -u fwcd -p "$GH_TOKEN"
+docker login docker.pkg.github.com -u fwcd -p "$GITHUB_TOKEN"
 docker build -t docker.pkg.github.com/fwcd/kotlin-language-server/server:latest .
 docker push docker.pkg.github.com/fwcd/kotlin-language-server/server:latest
diff --git a/scripts/deploy-maven b/scripts/deploy-maven
@@ -1,2 +1,2 @@
 #!/bin/bash
-./gradlew :shared:publish :server:publish -x test -Pgpr.user=fwcd -Pgpr.key="$GH_TOKEN"
+./gradlew :shared:publish :server:publish -x test -Pgpr.user=fwcd -Pgpr.key="$GITHUB_TOKEN"
diff --git a/server/build.gradle b/server/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
-    id 'maven'
+    id 'maven-publish'
     id 'application'
     id 'com.github.jk1.tcdeps' version '1.2'
     id 'com.jaredsburrows.license' version '0.8.42'
diff --git a/server/src/test/kotlin/org/javacs/kt/AdditionalWorkspaceTest.kt b/server/src/test/kotlin/org/javacs/kt/AdditionalWorkspaceTest.kt
@@ -28,9 +28,7 @@ class AdditionalWorkspaceTest : LanguageServerTestFixture("mainWorkspace") {
         open(file)
 
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 5, 14)).get()!!
-
-        assertThat(hover.contents.left, not(emptyList()))
-        assertThat(hover.contents.left.first().right.value, containsString("fun assertTrue"))
+        assertThat(hover.contents.right.value, containsString("fun assertTrue"))
     }
 
     @Ignore // TODO
@@ -42,7 +40,6 @@ class AdditionalWorkspaceTest : LanguageServerTestFixture("mainWorkspace") {
 
         addWorkspaceRoot()
         val hoverAgain = languageServer.textDocumentService.hover(hoverParams(file, 5, 14)).get() ?: return fail("No hover")
-        assertThat(hoverAgain.contents.left, not(emptyList()))
-        assertThat(hoverAgain.contents.left.first().right.value, containsString("fun assertTrue"))
+        assertThat(hoverAgain.contents.right.value, containsString("fun assertTrue"))
     }
 }
diff --git a/server/src/test/kotlin/org/javacs/kt/CompiledFileTest.kt b/server/src/test/kotlin/org/javacs/kt/CompiledFileTest.kt
@@ -1,6 +1,7 @@
 package org.javacs.kt
 
 import org.hamcrest.Matchers.equalTo
+import org.javacs.kt.compiler.Compiler
 import org.junit.Assert.assertThat
 import org.junit.Test
 import org.junit.BeforeClass
diff --git a/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt b/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtReferenceExpression
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.javacs.kt.compiler.Compiler
 import org.junit.Assert.assertThat
 import org.junit.Test
 import org.junit.After
diff --git a/server/src/test/kotlin/org/javacs/kt/GradleDSLScriptTest.kt b/server/src/test/kotlin/org/javacs/kt/GradleDSLScriptTest.kt
@@ -15,8 +15,8 @@ class GradleDSLScriptTest : SingleFileTestFixture("kotlinDSLWorkspace", "build.g
 
     @Test fun `hover plugin`() {
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 4, 8)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertThat(contents, equalTo(MarkupContent("kotlin", "fun PluginDependenciesSpec.kotlin(module: String): PluginDependencySpec")))
+        assertThat(contents.value, containsString("fun PluginDependenciesSpec.kotlin(module: String): PluginDependencySpec"))
     }
 }
diff --git a/server/src/test/kotlin/org/javacs/kt/HoverTest.kt b/server/src/test/kotlin/org/javacs/kt/HoverTest.kt
@@ -1,59 +1,54 @@
 package org.javacs.kt
 
-import org.junit.Assert.assertEquals
+import org.hamcrest.Matchers.*
+import org.junit.Assert.assertThat
 import org.junit.Test
 
 class HoverLiteralsTest : SingleFileTestFixture("hover", "Literals.kt") {
     @Test fun `string reference`() {
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 3, 19)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("val stringLiteral: String", contents.value)
+        assertThat(contents.value, containsString("val stringLiteral: String"))
     }
 }
 
 class HoverFunctionReferenceTest : SingleFileTestFixture("hover", "FunctionReference.kt") {
     @Test fun `function reference`() {
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 2, 45)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("fun isFoo(s: String): Boolean", contents.value)
+        assertThat(contents.value, containsString("fun isFoo(s: String): Boolean"))
     }
 }
 
 class HoverObjectReferenceTest : SingleFileTestFixture("hover", "ObjectReference.kt") {
     @Test fun `object reference`() {
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 2, 7)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("object AnObject", contents.value)
+        assertThat(contents.value, containsString("object AnObject"))
     }
 
     @Test fun `object reference with incomplete method`() {
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 6, 7)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("object AnObject", contents.value)
+        assertThat(contents.value, containsString("object AnObject"))
     }
 
     @Test fun `object reference with method`() {
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 10, 7)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("object AnObject", contents.value)
+        assertThat(contents.value, containsString("object AnObject"))
     }
 
     @Test fun `object method`() {
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 10, 15)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("fun doh(): Unit", contents.value)
+        assertThat(contents.value, containsString("fun doh(): Unit"))
     }
 }
 
@@ -62,20 +57,18 @@ class HoverRecoverTest : SingleFileTestFixture("hover", "Recover.kt") {
         replace(file, 2, 9, "\"Foo\"", "intFunction()")
 
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 2, 11)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("fun intFunction(): Int", contents.value)
+        assertThat(contents.value, containsString("fun intFunction(): Int"))
     }
 
     @Test fun `incrementally repair a block function`() {
         replace(file, 5, 13, "\"Foo\"", "intFunction()")
 
         val hover = languageServer.textDocumentService.hover(hoverParams(file, 5, 13)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("fun intFunction(): Int", contents.value)
+        assertThat(contents.value, containsString("fun intFunction(): Int"))
     }
 }
 
@@ -87,9 +80,8 @@ class HoverAcrossFilesTest : LanguageServerTestFixture("hover") {
         open(to)
 
         val hover = languageServer.textDocumentService.hover(hoverParams(from, 3, 26)).get()!!
-        val contents = hover.contents.left.first().right
+        val contents = hover.contents.right
 
-        assertEquals("kotlin", contents.language)
-        assertEquals("fun target(): Unit", contents.value)
+        assertThat(contents.value, containsString("fun target(): Unit"))
     }
 }
diff --git a/shared/build.gradle b/shared/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
-    id 'maven'
+    id 'maven-publish'
 }
 
 version = projectVersion

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/bash`
`2`		`-./gradlew :shared:publish :server:publish -x test -Pgpr.user=fwcd -Pgpr.key="$GH_TOKEN"`
	`2`	`+./gradlew :shared:publish :server:publish -x test -Pgpr.user=fwcd -Pgpr.key="$GITHUB_TOKEN"`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ class AdditionalWorkspaceTest : LanguageServerTestFixture("mainWorkspace") {`
`28`	`28`	`open(file)`
`29`	`29`
`30`	`30`	`val hover = languageServer.textDocumentService.hover(hoverParams(file, 5, 14)).get()!!`
`31`		`-`
`32`		`- assertThat(hover.contents.left, not(emptyList()))`
`33`		`- assertThat(hover.contents.left.first().right.value, containsString("fun assertTrue"))`
	`31`	`+ assertThat(hover.contents.right.value, containsString("fun assertTrue"))`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`@Ignore // TODO`
`@@ -42,7 +40,6 @@ class AdditionalWorkspaceTest : LanguageServerTestFixture("mainWorkspace") {`
`42`	`40`
`43`	`41`	`addWorkspaceRoot()`
`44`	`42`	`val hoverAgain = languageServer.textDocumentService.hover(hoverParams(file, 5, 14)).get() ?: return fail("No hover")`
`45`		`- assertThat(hoverAgain.contents.left, not(emptyList()))`
`46`		`- assertThat(hoverAgain.contents.left.first().right.value, containsString("fun assertTrue"))`
	`43`	`+ assertThat(hoverAgain.contents.right.value, containsString("fun assertTrue"))`
`47`	`44`	`}`
`48`	`45`	`}`