Skip to content
This repository has been archived by the owner on Dec 1, 2024. It is now read-only.

Commit

Permalink
simpler
Browse files Browse the repository at this point in the history
  • Loading branch information
jjba23 committed Sep 30, 2024
1 parent 2ba58ea commit 159f78d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 57 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ concurrency:
cancel-in-progress: true


env:
GITHUB_TOKEN: ${{ secrets.ZZSPEC_PUBLISH_TOKEN }}
# env:
# GITHUB_TOKEN: ${{ secrets.ZZSPEC_PUBLISH_TOKEN }}

jobs:
ci:
Expand All @@ -25,9 +25,9 @@ jobs:
cache: sbt
- name: tests
run: sbt "test"
- name: publish
if: startsWith(github.ref, 'refs/tags/v')
run: sbt "publish" || true
# - name: publish
# if: startsWith(github.ref, 'refs/tags/v')
# run: sbt "publish" || true
# - name: publish docs
# run: sbt "ghpagesPushSite" || true

50 changes: 2 additions & 48 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,63 +1,17 @@
import scala.util.control.NonFatal
import com.github.sbt.git.SbtGit.GitKeys

ThisBuild / version := "0.8.4"
ThisBuild / version := "0.8.6"

name := "zzspec"

ThisBuild / resolvers += "Mulesoft".at(
"https://repository.mulesoft.org/nexus/content/repositories/public/"
)

ThisBuild / organizationHomepage := Some(url("https://github.com/jjba23/zzspec"))

ThisBuild / versionScheme := Some("semver-spec")

ThisBuild / developers := List(Developer(id = "jjba23", name = "Josep Bigorra", email = "jjbigorra@gmail.com", url = url("https://github.com/jjba23")))

ThisBuild / githubOwner := "jjba23"
ThisBuild / githubRepository := "zzspec"

publishConfiguration := publishConfiguration.value.withOverwrite(true)
publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true)
Compile / pushRemoteCacheConfiguration := null

val zzspec = project
.settings(
libraryDependencies ++= zzspecDependencies,
dependencyOverrides ++= zzspecDependencyOverrides,
dependencyOverrides ++= zzspecDependencyOverrides
)

githubTokenSource := TokenSource.Environment("GITHUB_TOKEN")

// enablePlugins(GhpagesPlugin)
// enablePlugins(SiteScaladocPlugin)

// git.remoteRepo := "git@personal.github.com:jjba23/zzspec.git"
// git.remoteRepo := "git@github.com:jjba23/zzspec.git"

// def pushSiteTask =
// Def.task {
// val git = GitKeys.gitRunner.value
// val repo = ghpagesSynchLocal.value
// val s = streams.value.log
// git("add", ".")(repo, s)
// try {
// git("id", "personal")(repo, s)
// val commit = "commit" +: ghpagesCommitOptions.value
// git(commit: _*)(repo, s)
// } catch {
// case NonFatal(e) =>
// s.info(e.toString)
// }
// git.push(repo, s)
// }

// ghpagesPushSite := pushSiteTask.value
// val ZZSpec = config("zzspec")

// lazy val siteWithScaladoc = project
// .in(file("site/scaladoc"))
// .settings(
// SiteScaladocPlugin.scaladocSettings(ZZSpec, zzspec / Compile / packageDoc / mappings, "api/zzspec")
// )
7 changes: 3 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.9.9" cross CrossVersion.full)

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3")
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")

0 comments on commit 159f78d

Please sign in to comment.