Merge pull request #37 from scala-exercises/brings-new-pgp-keys

Updates PGP keys

Author: juanpedromoreno

.travis.yml

@@ -1,19 +1,27 @@
 language: scala
 sudo: required
 scala:
-  - 2.11.8
+- 2.11.8
 jdk:
-  - oraclejdk8
+- oraclejdk8
 cache:
   directories:
-    - $HOME/.coursier/cache	
-    - $HOME/.ivy2/cache
-    - $HOME/.sbt/boot/
+  - $HOME/.coursier/cache
+  - $HOME/.ivy2/cache
+  - $HOME/.sbt/boot/
 env:
-  global:
-    JAVA_OPTS=-Xmx2g
-    SBT_OPTS="-XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m"
+  global: JAVA_OPTS=-Xmx2g SBT_OPTS="-XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m"
 script:
-  - sbt test
+- sbt test
+
+before_install:
+- openssl aes-256-cbc -K $encrypted_98b97a2f355e_key -iv $encrypted_98b97a2f355e_iv
+  -in secring.gpg.enc -out secring.gpg -d
+
 after_success:
-  - bash deploy.sh
+- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
+     sbt publishSignedAll;
+  fi
+- if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
+     echo "Not in master branch, skipping deploy and release";
+  fi

deploy.sh

@@ -90,15 +90,15 @@ object EvaluatorBuild extends AutoPlugin {
     }
   )
 
-  private[this] lazy val gpgFolder = sys.env.getOrElse("SE_GPG_FOLDER", ".")
+  private[this] lazy val gpgFolder = sys.env.getOrElse("PGP_FOLDER", ".")
 
   private[this] lazy val publishSettings = Seq(
     organizationName := "Scala Exercises",
     organizationHomepage := Some(new URL("http://scala-exercises.org")),
     startYear := Some(2016),
     description := "Scala Exercises: The path to enlightenment",
     homepage := Some(url("http://scala-exercises.org")),
-    pgpPassphrase := Some(sys.env.getOrElse("SE_GPG_PASSPHRASE", "").toCharArray),
+    pgpPassphrase := Some(sys.env.getOrElse("PGP_PASSPHRASE", "").toCharArray),
     pgpPublicRing := file(s"$gpgFolder/pubring.gpg"),
     pgpSecretRing := file(s"$gpgFolder/secring.gpg"),
     credentials += Credentials(

project/EvaluatorBuild.scala

@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.51
+
+mQENBFgGJjoBCACkQzvPI+1VtMYz252a3i3wm1dKrsF5v/E//IsYLMsXx/4BICES
+bjZchmCbaIqjaNrfBxRAR20KbWVXbUptDJgXA/WOyGEUfDvS6Kfm1F6A34qVyCIr
+NPEIeDVM64nLpQFrNuIiFPlTj9eXbKPRbV0eUrtKH59iplB4DCboK4ysGX3Hk/A3
+nzmAf9+Lt9N8vuzO8ymYvdWfdzQsVPCSXkKhK2qpT+ORIPAPWGdXmZ6Rr1wAGwqY
++x0iVSL2IFs5MqDvBbDoyfnt14UVffJlI6O0C+flIY+kSCp86pYQrHHaCnWrnALU
+L8Cb/DJ7DODpd99bDHtkuMHUn4BO4WmoI69zABEBAAG0JXNjYWxhLWV4ZXJjaXNl
+cyA8ZGV2ZWxvcGVyQDQ3ZGVnLmNvbT6JARwEEwECAAYFAlgGJjoACgkQT9ktcdDT
+ZI66CQgAkGDi0EOapqJbFMiNTH85IelGs2c04aNPnEGZh+dUHqpJvA785PduXtzT
+XEP8DVP4zgjfGoDyiaJWBVXyg6Ch7XZ6gNodgOS7oQu5nFsA6ZBtwVy0qfRjfK2E
+NEIvRuNjQuAlDTDHRfDtZmFIDSd4YR/smJL7BVrO5eT+qsbeluZGGi54TY/zwLbe
+TefcUmTixDhm5LGyVPKiEdZwk6o385+9IAFycFozb9K/1NSTBM1GbZBMR/WuACbT
+K+DDtqUnGk1cZmNbWzoVabNnubVhGnhMC9AW24pzHu+xEk13yXsPWVikB6NbVg50
+TBkuFf9IEXMEzanKMDDMOatih3a8bg==
+=fR5S
+-----END PGP PUBLIC KEY BLOCK-----