Merge branch 'current-docs'

This commit is contained in:
eikek 2021-05-31 13:59:44 +02:00
commit 626a53384b
4 changed files with 12 additions and 14 deletions

View File

@ -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._
@ -572,18 +571,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"

View File

@ -1,6 +1,7 @@
let
nixpkgs = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/nixos-20.09.tar.gz";
## need fix to zola-0.11.0 for now
url = "https://github.com/NixOS/nixpkgs/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz";
};
pkgs = import nixpkgs { };
initScript = pkgs.writeScript "docspell-build-init" ''

View File

@ -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")

View File

@ -1,10 +1,11 @@
let
nixpkgsUnstable = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs-channels/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz";
nixpkgs = builtins.fetchTarball {
## need fix to zola-0.11.0 for now
url = "https://github.com/NixOS/nixpkgs/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz";
};
pkgsUnstable = import nixpkgsUnstable { };
pkgs = import nixpkgs { };
in
with pkgsUnstable;
with pkgs;
mkShell {
buildInputs = [