Merge pull request #2347 from alexarchambault/fix-website-ci

Fix website CI

build.sc

@@ -790,7 +790,8 @@ def updateWebsite(dryRun: Boolean = false) = {
         versionedDocsBranch,
         ghTokenOpt = Some(token),
         newVersion = version,
-        dryRun = dryRun
+        dryRun = dryRun,
+        cloneUnder = T.dest / "repo"
       )
 
     // copyDemoFiles()
@@ -800,8 +801,9 @@ def updateWebsite(dryRun: Boolean = false) = {
       token,
       "coursier/coursier",
       branch = "gh-pages",
-      dryRun = dryRun
-    )()
+      dryRun = dryRun,
+      dest = T.dest / "gh-pages"
+    )
   }
 }
 

project/docs.sc

@@ -1,13 +1,12 @@
 def copyDocusaurusVersionedData(
   repo: String,
   branch: String,
-  docusaurusDir: os.Path
-) = T.command {
+  docusaurusDir: os.Path,
+  cloneUnder: os.Path
+): Unit = {
 
   val remote = s"https://github.com/$repo.git"
 
-  val cloneUnder = T.dest / "repo"
-
   os.proc("git", "clone", remote, "-b", branch, cloneUnder.toString).call(
     stdin = os.Inherit,
     stdout = os.Inherit,
@@ -35,21 +34,30 @@ def copyDocusaurusVersionedData(
   }
 }
 
+private def runAndLog(secrets: Seq[String])(command: os.Shellable*) = {
+  val msg = secrets.foldLeft(s"Running ${command.flatMap(_.value)}") { (msg0, secret) =>
+    msg0.replace(secret, "****")
+  }
+  System.err.println(msg)
+  os.proc(command: _*)
+}
+
 def updateVersionedDocs(
   docusaurusDir: os.Path,
   repo: String,
   branch: String,
   ghTokenOpt: Option[String],
   newVersion: String,
-  dryRun: Boolean
-) = T.command {
+  dryRun: Boolean,
+  cloneUnder: os.Path
+): Unit = {
 
   val remote = s"https://${ghTokenOpt.map(_ + "@").getOrElse("")}github.com/$repo.git"
 
-  val cloneUnder = T.dest / "repo"
   os.makeDir.all(cloneUnder)
 
-  os.proc("git", "clone", remote, "-b", branch, cloneUnder.toString).call(
+  System.err.println()
+  runAndLog(ghTokenOpt.toSeq)("git", "clone", remote, "-b", branch, cloneUnder.toString).call(
     stdin = os.Inherit,
     stdout = os.Inherit,
     stderr = os.Inherit
@@ -58,20 +66,20 @@ def updateVersionedDocs(
   // TODO Check if newVersion is already in versions.json
 
   // FIXME We don't necessarily run on Travis CI
-  os.proc("git", "config", "user.name", "Github Actions").call(
+  runAndLog(ghTokenOpt.toSeq)("git", "config", "user.name", "Github Actions").call(
     cwd = cloneUnder,
     stdin = os.Inherit,
     stdout = os.Inherit,
     stderr = os.Inherit
   )
-  os.proc("git", "config", "user.email", "actions@github.com").call(
+  runAndLog(ghTokenOpt.toSeq)("git", "config", "user.email", "actions@github.com").call(
     cwd = cloneUnder,
     stdin = os.Inherit,
     stdout = os.Inherit,
     stderr = os.Inherit
   )
 
-  os.proc("yarn", "run", "version", newVersion).call(
+  runAndLog(ghTokenOpt.toSeq)("yarn", "run", "version", newVersion).call(
     cwd = docusaurusDir,
     stdin = os.Inherit,
     stdout = os.Inherit,
@@ -80,17 +88,21 @@ def updateVersionedDocs(
 
   val toCopy = os.list(docusaurusDir).filter(_.last.startsWith("version"))
 
-  for (elem <- toCopy)
-    os.copy.into(elem, cloneUnder)
+  for (elem <- toCopy) {
+    val dest = cloneUnder / elem.last
+    if (os.exists(dest))
+      os.remove.all(dest)
+    os.copy(elem, dest)
+  }
 
-  os.proc("git", "add", toCopy.map(_.last)).call(
+  runAndLog(ghTokenOpt.toSeq)("git", "add", toCopy.map(_.last)).call(
     cwd = cloneUnder,
     stdin = os.Inherit,
     stdout = os.Inherit,
     stderr = os.Inherit
   )
 
-  os.proc("git", "commit", "-m", s"Add doc for $newVersion").call(
+  runAndLog(ghTokenOpt.toSeq)("git", "commit", "-m", s"Add doc for $newVersion").call(
     cwd = cloneUnder,
     stdin = os.Inherit,
     stdout = os.Inherit,
@@ -99,7 +111,7 @@ def updateVersionedDocs(
   if (dryRun)
     System.err.println(s"Would have pushed new docs to $repo")
   else
-    os.proc("git", "push", "origin", branch).call(
+    runAndLog(ghTokenOpt.toSeq)("git", "push", "origin", branch).call(
       cwd = cloneUnder,
       stdin = os.Inherit,
       stdout = os.Inherit,
@@ -114,11 +126,11 @@ def updateGhPages(
   ghToken: String,
   repo: String,
   dryRun: Boolean,
+  dest: os.Path,
   branch: String = "gh-pages"
-) = T.command {
+): Unit = {
   val remote = s"https://$ghToken@github.com/$repo.git"
 
-  val dest = T.dest / "gh-pages"
   os.makeDir.all(dest)
 
   os.proc("git", "clone", remote, "-q", "-b", branch, dest.toString).call(

project/modules/doc0.sc

@@ -21,7 +21,7 @@ trait Doc extends ScalaModule {
     branch: String = "master",
     docusaurusDir: os.Path = os.pwd / "doc" / "website"
   ) = T.command {
-    docs.copyDocusaurusVersionedData(repo, branch, docusaurusDir)
+    docs.copyDocusaurusVersionedData(repo, branch, docusaurusDir, T.dest / "repo")
   }
 
   def forkWorkingDir = T.dest