Skip to content

Commit 9adf0d3

Browse files
[#89] Test and publish though github actions instead of travis (#97)
1 parent 8c062f0 commit 9adf0d3

File tree

13 files changed

+42
-122
lines changed

13 files changed

+42
-122
lines changed

.github/workflows/release.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Release
2+
on:
3+
push:
4+
branches: [master, main, "feature/89"]
5+
tags: ["*"]
6+
jobs:
7+
publish:
8+
runs-on: ubuntu-20.04
9+
steps:
10+
- uses: actions/checkout@v2.3.4
11+
with:
12+
fetch-depth: 0
13+
- uses: olafurpg/setup-scala@v10
14+
- uses: olafurpg/setup-gpg@v3
15+
- run: ./publish.sh
16+
env:
17+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
18+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
19+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
20+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/test.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Test
2+
on:
3+
- push
4+
- pull_request
5+
jobs:
6+
test:
7+
runs-on: ubuntu-20.04
8+
steps:
9+
- uses: actions/checkout@v2.3.4
10+
with:
11+
fetch-depth: 0
12+
- uses: olafurpg/setup-scala@v10
13+
- run: ./make.sh

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,3 +208,4 @@ metals.sbt
208208
project/.bloop/*
209209
# End of https://www.gitignore.io/api/osx,sbt,java,linux,maven,scala,windows,intellij
210210
.bsp/
211+
.vscode/settings.json

.travis.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Darwin
22

3-
[![Build Status](https://travis-ci.org/agile-lab-dev/darwin.svg?branch=master)](https://travis-ci.org/agile-lab-dev/darwin)
43
[![Gitter](https://badges.gitter.im/agile-lab-darwin/community.svg)](https://gitter.im/agile-lab-darwin/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
54

65
<img align="right" height="260" src="docs/img/logo/darwin-icon.svg">

build.sbt

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ import sbt.Keys.baseDirectory
77
* See project/Dependencies.scala for the dependencies definitions.
88
* See project/Versions.scala for the versions definitions.
99
*/
10+
dynverVTagPrefix in ThisBuild := false
1011

11-
lazy val Settings.pgpPass = Option(System.getenv().get("PGP_PASS")).map(_.toArray)
1212
lazy val root = Project("darwin", file("."))
1313
.settings(Settings.commonSettings: _*)
1414
.settings(libraryDependencies ++= Dependencies.core_deps)
15-
.settings(pgpPassphrase := Settings.pgpPass)
1615
.settings(Settings.notPublishSettings)
17-
.enablePlugins(JavaAppPackaging)
1816
.aggregate(
1917
core,
2018
coreCommon,
@@ -30,112 +28,88 @@ lazy val root = Project("darwin", file("."))
3028
lazy val core = Project("darwin-core", file("core"))
3129
.settings(Settings.commonSettings: _*)
3230
.dependsOn(coreCommon)
33-
.settings(pgpPassphrase := Settings.pgpPass)
3431
.settings(libraryDependencies ++= Dependencies.core_deps)
3532
.settings(crossScalaVersions := Versions.crossScalaVersions)
36-
.enablePlugins(JavaAppPackaging)
3733

3834
lazy val coreCommon = Project("darwin-core-common", file("common"))
3935
.settings(Settings.commonSettings: _*)
40-
.settings(pgpPassphrase := Settings.pgpPass)
4136
.settings(libraryDependencies ++= Dependencies.core_deps)
4237
.settings(crossScalaVersions := Versions.crossScalaVersions)
43-
.enablePlugins(JavaAppPackaging)
4438

4539
lazy val hbaseConnector = Project("darwin-hbase-connector", file("hbase1"))
4640
.settings(Settings.commonSettings: _*)
4741
.dependsOn(coreCommon)
48-
.settings(pgpPassphrase := Settings.pgpPass)
4942
.settings(libraryDependencies ++= Dependencies.hbase_conn_dep)
5043
.settings(crossScalaVersions := Versions.crossScalaVersions)
5144
.settings(Compile / unmanagedSourceDirectories += baseDirectory.value / ".." / "hbase" / "src" / "main" / "scala")
5245
.settings(Test / unmanagedSourceDirectories += baseDirectory.value / ".." / "hbase" / "src" / "test" / "scala")
5346
.settings(Test / unmanagedResourceDirectories += baseDirectory.value / ".." / "hbase" / "src" / "test" / "resources")
5447
.settings(Settings.hbaseTestSettings)
55-
.enablePlugins(JavaAppPackaging)
5648

5749
lazy val hbaseConnector2 = Project("darwin-hbase2-connector", file("hbase2"))
5850
.settings(Settings.commonSettings: _*)
5951
.dependsOn(coreCommon)
60-
.settings(pgpPassphrase := Settings.pgpPass)
6152
.settings(libraryDependencies ++= Dependencies.hbase2_conn_dep)
6253
.settings(crossScalaVersions := Versions.crossScalaVersions)
6354
.settings(Compile / unmanagedSourceDirectories += baseDirectory.value / ".." / "hbase" / "src" / "main" / "scala")
6455
.settings(Test / unmanagedSourceDirectories += baseDirectory.value / ".." / "hbase" / "src" / "test" / "scala")
6556
.settings(Test / unmanagedResourceDirectories += baseDirectory.value / ".." / "hbase" / "src" / "test" / "resources")
6657
.settings(Settings.hbase2TestSettings)
67-
.enablePlugins(JavaAppPackaging)
6858

6959
lazy val postgresConnector = Project("darwin-postgres-connector", file("postgres"))
7060
.settings(Settings.commonSettings: _*)
7161
.dependsOn(coreCommon)
72-
.settings(pgpPassphrase := Settings.pgpPass)
7362
.settings(libraryDependencies ++= Dependencies.postgres_conn_dep)
7463
.settings(crossScalaVersions := Versions.crossScalaVersions)
75-
.enablePlugins(JavaAppPackaging)
7664

7765
lazy val restConnector = Project("darwin-rest-connector", file("rest"))
7866
.settings(Settings.commonSettings: _*)
7967
.dependsOn(coreCommon)
80-
.settings(pgpPassphrase := Settings.pgpPass)
8168
.settings(
8269
libraryDependencies ++= Dependencies.core_deps ++ Dependencies.wireMock :+ Dependencies.scalatest :+
8370
Dependencies.httpClient
8471
)
8572
.settings(crossScalaVersions := Seq(Versions.scala, Versions.scala_211, Versions.scala_213))
86-
.enablePlugins(JavaAppPackaging)
8773

8874
lazy val confluentConnector = Project("darwin-confluent-connector", file("confluent"))
8975
.settings(Settings.commonSettings: _*)
9076
.dependsOn(coreCommon)
91-
.settings(pgpPassphrase := Settings.pgpPass)
9277
.settings(
9378
libraryDependencies ++= Dependencies.core_deps ++
9479
Dependencies.wireMock ++
9580
Dependencies.confluentSchemaRegistryDependencies :+ Dependencies.scalatest
9681
)
9782
.settings(crossScalaVersions := Versions.crossScalaVersions)
98-
.enablePlugins(JavaAppPackaging)
9983

10084
lazy val restServer = Project("darwin-rest-server", file("rest-server"))
10185
.settings(Settings.commonSettings: _*)
10286
.dependsOn(coreCommon, mockConnector)
103-
.settings(pgpPassphrase := Settings.pgpPass)
10487
.settings(libraryDependencies ++= Dependencies.restServer)
10588
.settings(crossScalaVersions := Seq(Versions.scala, Versions.scala_211, Versions.scala_213))
10689
.dependsOn(core, hbaseConnector, postgresConnector, mockConnector)
107-
.enablePlugins(JavaAppPackaging)
10890

10991
lazy val mongoConnector = Project("darwin-mongo-connector", file("mongo"))
11092
.settings(Settings.commonSettings: _*)
11193
.dependsOn(coreCommon)
112-
.settings(pgpPassphrase := Settings.pgpPass)
11394
.settings(libraryDependencies ++= Dependencies.mongo_conn)
11495
.settings(crossScalaVersions := Seq(Versions.scala, Versions.scala_211, Versions.scala_213))
115-
.enablePlugins(JavaAppPackaging)
11696

11797
lazy val mockConnector = Project("darwin-mock-connector", file("mock-connector"))
11898
.settings(Settings.commonSettings: _*)
11999
.dependsOn(coreCommon)
120-
.settings(pgpPassphrase := Settings.pgpPass)
121100
.settings(libraryDependencies ++= Dependencies.mock_conn)
122101
.settings(crossScalaVersions := Versions.crossScalaVersions)
123-
.enablePlugins(JavaAppPackaging)
124102

125103
lazy val mockApplication = Project("darwin-mock-application", file("mock-application"))
126104
.settings(Settings.commonSettings: _*)
127105
.dependsOn(core, mockConnector, postgresConnector, hbaseConnector)
128-
.settings(pgpPassphrase := Settings.pgpPass)
129106
.settings(libraryDependencies ++= Dependencies.mock_app_dep)
130107
.settings(crossScalaVersions := Versions.crossScalaVersions)
131108
.settings(Settings.notPublishSettings)
132-
.enablePlugins(JavaAppPackaging)
133109

134110
lazy val sparkApplication = Project("darwin-spark-application", file("spark-application"))
135111
.settings(Settings.commonSettings: _*)
136-
.settings(pgpPassphrase := Settings.pgpPass)
137112
.dependsOn(core, hbaseConnector, postgresConnector)
138113
.settings(libraryDependencies ++= Dependencies.spark_app)
139114
.settings(crossScalaVersions := Seq(Versions.scala, Versions.scala_211))
140115
.settings(Settings.notPublishSettings)
141-
.enablePlugins(JavaAppPackaging)

make.sh

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
#!/bin/bash
2-
set -ex
3-
COMMAND=sbtn
4-
if ! command -v $COMMAND &> /dev/null
5-
then
6-
echo "$COMMAND could not be found"
7-
echo "using sbt"
8-
COMMAND="sbt"
9-
else
10-
if [ ! $TRAVIS ]; then
11-
sbtn shutdown
12-
fi
13-
fi
14-
$COMMAND "clean; scalastyle; +test; +doc"
15-
$COMMAND "darwin-hbase2-connector/clean; darwin-hbase2-connector/scalastyle; +darwin-hbase2-connector/test; +darwin-hbase2-connector/doc"
2+
sbt clean scalastyle +test +doc darwin-hbase2-connector/clean darwin-hbase2-connector/scalastyle +darwin-hbase2-connector/test +darwin-hbase2-connector/doc

project/Settings.scala

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.typesafe.sbt.SbtPgp.autoImport._
21
import org.scalastyle.sbt.ScalastylePlugin.autoImport._
32
import sbt.Keys._
43
import sbt.{ Def, _ }
@@ -111,33 +110,9 @@ object Settings {
111110

112111
lazy val notPublishSettings = Seq(skip in publish := true)
113112

114-
lazy val myCredentials = Credentials(
115-
"Bintray API Realm",
116-
"api.bintray.com",
117-
System.getenv().get("BINTRAY_USERNAME"),
118-
System.getenv().get("BINTRAY_API_KEY")
119-
)
120-
121-
lazy val ciPublishSettings = {
122-
if (System.getenv().containsKey("TRAVIS")) {
123-
Seq(pgpSecretRing := file("./secring.asc"), pgpPublicRing := file("./pubring.asc"))
124-
} else {
125-
Seq.empty
126-
}
127-
}
128-
129-
lazy val pgpPass: Option[Array[Char]] = Option(System.getenv().get("PGP_PASS")).map(_.toArray)
130-
131113
lazy val scalastyleSettings = Seq(scalastyleFailOnWarning := true)
132114

133-
// lazy val testSettings = Seq(parallelExecution in Test := false)
134-
135115
lazy val publishSettings = Seq(
136-
publishTo := Some("bintray" at "https://api.bintray.com/maven/agile-lab-dev/Darwin/darwin/;publish=1"),
137-
credentials += myCredentials,
138-
publishMavenStyle := true,
139-
updateOptions := updateOptions.value.withGigahorse(false),
140-
useGpg := false,
141116
pomExtra := <scm>
142117
<connection>
143118
scm:git:git://github.com/agile-lab-dev/darwin.git
@@ -188,5 +163,5 @@ object Settings {
188163
<email>andrea.fonti@agilelab.it</email>
189164
</developer>
190165
</developers>
191-
) ++ ciPublishSettings
166+
)
192167
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.4.2
1+
sbt.version = 1.4.7

project/plugin.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.2")
2-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8")
31
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
4-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
2+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")

0 commit comments

Comments
 (0)