Merge pull request #20 from ckipp01/mill-ci-release

chore(ci): start using mill-ci-release

Author: Baccata

.github/workflows/ci.yml

@@ -5,7 +5,6 @@ on:
     branches: ["*"]
   push:
     branches: ["main"]
-    tags: ["v*"]
 
 concurrency:
   group: ci-${{ github.ref }}
@@ -34,36 +33,10 @@ jobs:
     - name: Setup Mill
       uses: jodersky/setup-mill@master
       with:
-        mill-version: 0.10.5
+        mill-version: 0.10.7
 
     - name: Run tests
       run: |
         mill -k --disable-ticker __.resolvedIvyDeps &&
         mill -k --disable-ticker mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll __.sources &&
         mill -j 0 -k --disable-ticker __.test
-
-    - name: Set up GPG
-      if: startsWith(github.ref, 'refs/tags/v')
-      run: |
-        mkdir ~/.gnupg && chmod 700 ~/.gnupg
-        echo use-agent >> ~/.gnupg/gpg.conf
-        echo pinentry-mode loopback >> ~/.gnupg/gpg.conf
-        echo allow-loopback-pinentry >> ~/.gnupg/gpg-agent.conf
-        chmod 600 ~/.gnupg/*
-        echo RELOADAGENT | gpg-connect-agent
-        echo $PGP_SECRET | base64 --decode | gpg --import --no-tty --batch --yes
-      env:
-        PGP_SECRET: ${{ secrets.PGP_SECRET }}
-
-    - name: Publish release
-      if: startsWith(github.ref, 'refs/tags/v')
-      run: |
-        export GPG_TTY=$(tty)
-        mill -j 0 -k --disable-ticker mill.scalalib.PublishModule/publishAll \
-          --publishArtifacts __.publishArtifacts \
-          --sonatypeCreds ${{ secrets.SONATYPE_USERNAME }}:${{secrets.SONATYPE_PASSWORD }} \
-          --gpgArgs '--passphrase=${{ secrets.PGP_PASSPHRASE }},--batch,--yes,-a,-b' \
-          --sonatypeUri https://s01.oss.sonatype.org/service/local \
-          --sonatypeSnapshotUri https://s01.oss.sonatype.org/content/repositories/snapshots \
-          --signed true \
-          --release true

.github/workflows/release.yml

@@ -0,0 +1,35 @@
+name: Release
+on:
+  push:
+    branches:
+      - main
+    tags: ["*"]
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Cache
+      uses: coursier/cache-action@v6
+
+    - name: Setup Java
+      uses: actions/setup-java@v2
+      with:
+          distribution: adopt
+          java-version: 11
+
+    - name: Setup Mill
+      uses: jodersky/setup-mill@master
+      with:
+        mill-version: 0.10.7
+
+    - name: Publish
+      run: mill -j 0 -k -i --disable-ticker io.kipp.mill.ci.release.ReleaseModule/publishAll
+      env:
+        PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+        PGP_SECRET: ${{ secrets.PGP_SECRET }}
+        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

build.sc

@@ -2,7 +2,7 @@ import mill.define.Target
 import mill.util.Jvm
 import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
 import $ivy.`io.github.davidgregory084::mill-tpolecat::0.3.1`
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.2.0`
+import $ivy.`io.chris-kipp::mill-ci-release::0.1.0`
 
 import os.Path
 import mill._
@@ -12,7 +12,7 @@ import scalajslib._
 import scalanativelib._
 import mill.scalajslib.api._
 import io.github.davidgregory084._
-import de.tobiasroeser.mill.vcs.version.VcsVersion
+import io.kipp.mill.ci.release.CiReleaseModule
 
 object versions {
   val scala212Version = "2.12.16"
@@ -270,12 +270,12 @@ trait RPCCrossPlatformModule extends Module { shared =>
   }
 }
 
-trait JsonRPCModule extends ScalaModule with PublishModule with scalafmt.ScalafmtModule {
+trait JsonRPCModule extends ScalaModule with CiReleaseModule with scalafmt.ScalafmtModule {
   def scalafmt() = T.command(reformat())
   def fmt() = T.command(reformat())
   def refreshedEnv = T.input(T.ctx().env)
   def publishVersion = T {
-    if (refreshedEnv().contains("CI")) VcsVersion.vcsState().format()
+    if (refreshedEnv().contains("CI")) super.publishVersion()
     else "dev"
   }
   override def scalacOptions = T {
@@ -294,4 +294,8 @@ trait JsonRPCModule extends ScalaModule with PublishModule with scalafmt.Scalafm
       Developer("Baccata", "Olivier Mélois", "https://github.com/baccata")
     )
   )
+
+  override def sonatypeUri = "https://s01.oss.sonatype.org/service/local"
+  override def sonatypeSnapshotUri =
+    "https://s01.oss.sonatype.org/content/repositories/snapshots"
 }