diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 2639b9b..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,32 +0,0 @@ -pipeline { - options { - timeout(time: 1, unit: 'HOURS') - } - - agent any - - environment { - JAVA_HOME = sh(script: 'readlink -f /usr/lib/jvm/jre', returnStdout: true).trim() - } - - stages { - stage('Build Container') { - steps { - sh 'docker build -t ecos-java-scala .' - } - } - - - stage('Test') { - steps { - sh 'docker run --rm ecos-java-scala:latest sbt -Dsbt.log.noformat=true +test' - } - } - - stage('Publish to nexus') { - steps { - sh 'docker run --rm ecos-java-scala:latest sbt -Dsbt.log.noformat=true +publish' - } - } - } -} diff --git a/Jenkinsfile.pr b/Jenkinsfile.pr deleted file mode 100644 index 016b96a..0000000 --- a/Jenkinsfile.pr +++ /dev/null @@ -1,35 +0,0 @@ -pipeline { - options { - timeout(time: 1, unit: 'HOURS') - } - - agent any - - - stages { - stage('Update PR check status to pending') { - steps { - setCommitStatusPending() - } - } - - stage('Build Container') { - steps { - sh 'docker build -t ecos-java-scala .' - } - } - - stage('Test') { - steps { - sh 'docker run --rm ecos-java-scala:latest sbt -Dsbt.log.noformat=true +test' - } - } - - } - - post { - always { - setCommitStatusCompleted() - } - } -} diff --git a/build.sbt b/build.sbt index 6728408..b7bbb73 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import Dependencies._ ThisBuild / scalaVersion := "2.13.15" -ThisBuild / version := "0.0.11" +ThisBuild / version := "0.0.12" ThisBuild / versionScheme := Some("early-semver") ThisBuild / organization := "io.citrine" ThisBuild / organizationName := "Citrine Informatics" @@ -19,25 +19,12 @@ ThisBuild / credentials += Credentials( ) lazy val githubRepository = "GitHub Package Registry" at s"https://maven.pkg.github.com/CitrineInformatics/ecos-java-scala" -lazy val nexusRepository = "Citrine Nexus" at "https://nexus.corp.citrine.io/repository/citrine/" - -lazy val publishTarget = sys.env.get("PUBLISH_TO_GITHUB") match { - case Some("true") => Some(githubRepository) - case _ => Some(nexusRepository) -} lazy val commonSettings = Seq( javah / target := sourceDirectory.value / "native" / "include", crossPaths := true, packageDoc / publishArtifact := false, - publishTo := { - if (isSnapshot.value) { - None - } else { - publishTarget - } - }, - publishConfiguration := publishConfiguration.value.withOverwrite(true) + publishTo := Some(githubRepository) ) lazy val root = (project in file("."))