Skip to content

Commit

Permalink
Try and Fix Git Versioning during CI (#35)
Browse files Browse the repository at this point in the history
* Fix typo in private key generation

* update versioning

* upgrade scalafix and apply outstanding fixes
  • Loading branch information
DamianReeves authored Jun 16, 2020
1 parent 819b2c0 commit 560985f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ jobs:
git config --global user.name "CI"
./mill all __.checkFormat "__.fix --check" __.docJar __.test
- name: Status Check
run: |
git status
- name: Publish
if: github.ref == 'refs/heads/master' || github.event_name == 'release'
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || github.event_name == 'release'
run: |
echo "${{ secrets.PGP_SECRET }}" > private.key
gpg --batch --yes --import private.key
Expand Down
5 changes: 3 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import $ivy.`com.goyeau::mill-git:0.1.0-8-5ed3839`
import $ivy.`com.goyeau::mill-scalafix:8515ae6`
import $ivy.`com.goyeau::mill-scalafix:c71a533`
import $ivy.`io.github.davidgregory084::mill-tpolecat:0.1.3`
import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
import com.goyeau.mill.git.GitVersionedPublishModule
import com.goyeau.mill.git._
import com.goyeau.mill.scalafix.ScalafixModule
import io.github.davidgregory084.TpolecatModule
import mill._
Expand Down Expand Up @@ -64,6 +64,7 @@ trait MorphirPublishModule extends GitVersionedPublishModule {
)
)
)
def publishVersion: T[String] = GitVersionModule.version(withSnapshotSuffix = true)()
}

trait ScalaMacroModule extends ScalaModule {
Expand Down
2 changes: 1 addition & 1 deletion morphir/scala/src/morphir/lang/scala/Naming.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import morphir.ir.FQName
import scala.meta.{ Term, Type => MType }

object Naming {
implicit class FQNameOps(val fqn: FQName) extends AnyVal {
implicit class FQNameOps(private val fqn: FQName) extends AnyVal {
def toTypeName: scala.meta.Type.Name =
scala.meta.Type.Name(fqn.toString)

Expand Down

0 comments on commit 560985f

Please sign in to comment.