From bd093ee97d0a21f94dc67387ecd4edf53ef96a6b Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 31 May 2021 13:44:47 +0200 Subject: [PATCH] Use sbt-github-pages plugin This makes it easier to use within a gitub action. --- build.sbt | 12 ++++-------- project/plugins.sbt | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index c5d74fe7..8427f7cb 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,5 @@ import com.github.eikek.sbt.openapi._ import scala.sys.process._ -import com.typesafe.sbt.site.SitePlugin import com.typesafe.sbt.SbtGit.GitKeys._ import docspell.build._ @@ -565,18 +564,15 @@ val restserver = project val website = project .in(file("website")) .disablePlugins(RevolverPlugin, ReleasePlugin) - .enablePlugins(ZolaPlugin, GhpagesPlugin) + .enablePlugins(ZolaPlugin, GitHubPagesPlugin) .settings(sharedSettings) .settings( name := "docspell-website", publishArtifact := false, publish / skip := true, - ghpagesNoJekyll := true, - // the ghpages plugins works together with the site plugin (its a dependency) - // to make it publish the zola generated site, override their mappings with the zola output - SitePlugin.autoImport.makeSite / mappings := - Path.selectSubpaths(zolaOutputDir.value, _ => true).toSeq, - git.remoteRepo := "git@github.com:eikek/docspell", + gitHubPagesOrgName := "eikek", + gitHubPagesRepoName := "docspell", + gitHubPagesSiteDir := zolaOutputDir.value, Compile / resourceGenerators += Def.task { val templateOut = baseDirectory.value / "site" / "templates" / "shortcodes" val staticOut = baseDirectory.value / "site" / "static" / "openapi" diff --git a/project/plugins.sbt b/project/plugins.sbt index 79998eef..3074d36c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.7.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") +addSbtPlugin("io.kevinlee" % "sbt-github-pages" % "0.5.0") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")