Fix doc publishing

Author: thesamet

.github/workflows/release.yml

@@ -21,6 +21,9 @@ jobs:
     - uses: actions/setup-java@v1
       with:
         java-version: 12
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
     - uses: olafurpg/setup-gpg@v2
       if: startsWith(github.ref, 'refs/tags/v')
     - name: Publish ${{ github.ref }}
@@ -30,10 +33,6 @@ jobs:
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
         SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
     - name: Update docs
       run: |
         git config --global user.name "ScalaPB Docs"
@@ -46,6 +45,8 @@ jobs:
         yarn deploy
       env:
           TOKEN: ${{secrets.DEPLOY_KEY}}
+          USE_SSH: true
+          GIT_USER: git
 
   scalapbc:
     runs-on: ubuntu-latest

build.sbt

@@ -291,11 +291,11 @@ lazy val e2eNoJava = (projectMatrix in file("e2e-nojava"))
   )
 
 lazy val docs = project
-  .in(file("scalapb-docs"))
   .enablePlugins(MdocPlugin, DocusaurusPlugin, ScalaUnidocPlugin)
   .dependsOn(runtimeJVM2_12)
   .settings(commonSettings)
   .settings(
+    publish / skip := true,
     scalaVersion := Scala212,
     crossScalaVersions := Seq(Scala212),
     libraryDependencies ++= Seq(
@@ -306,7 +306,7 @@ lazy val docs = project
       "com.lihaoyi"          %% "os-lib"           % "0.5.0",
       "org.plotly-scala"     %% "plotly-render"    % "0.7.2"
     ),
-    // mdocIn := baseDirectory.value / "src" / "main" / "markdown",
+    mdocIn := baseDirectory.value / "src" / "main" / "markdown",
     siteSubdirName in ScalaUnidoc := "api/scalapb/latest",
     addMappingsToSiteDir(mappings in (ScalaUnidoc, packageDoc), siteSubdirName in ScalaUnidoc),
     unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects(
@@ -318,11 +318,10 @@ lazy val docs = project
     cleanFiles += (target in (ScalaUnidoc, unidoc)).value,
     docusaurusCreateSite := docusaurusCreateSite.dependsOn(unidoc in Compile).value,
     docusaurusPublishGhpages := docusaurusPublishGhpages.dependsOn(unidoc in Compile).value,
-
     mdocVariables := Map(
-      "scalapb" -> "0.10.8",
-      "sbt_protoc" -> "0.99.34",
-      "protoc" -> "3.11.4",
+      "scalapb"          -> "0.10.8",
+      "sbt_protoc"       -> "0.99.34",
+      "protoc"           -> "3.11.4",
       "sparksql_scalapb" -> "0.10.4"
     ),
     git.remoteRepo := "[email protected]:scalapb/scalapb.github.io.git",
@@ -331,5 +330,5 @@ lazy val docs = project
     includeFilter in ghpagesCleanSite := GlobFilter(
       (ghpagesRepository.value / "README.md").getCanonicalPath
     )
-    */
+   */
   )