From 06e47757a2939010fca15c9827a87e08db428162 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Tue, 18 Oct 2016 18:02:10 +0200 Subject: [PATCH 1/2] Updates PGP keys --- .gitignore | 1 - .travis.yml | 18 ++++++++++++++---- build.sbt | 29 +++-------------------------- deploy.sh | 23 ----------------------- keys.tar.gpg | Bin 2875 -> 0 bytes pubring.gpg | 18 ++++++++++++++++++ secring.gpg.enc | Bin 0 -> 1856 bytes 7 files changed, 35 insertions(+), 54 deletions(-) delete mode 100755 deploy.sh delete mode 100644 keys.tar.gpg create mode 100644 pubring.gpg create mode 100644 secring.gpg.enc diff --git a/.gitignore b/.gitignore index e64dd86c..0e4deb27 100755 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,4 @@ bin/ .DS_Store # PGP keys -pubring.gpg secring.gpg \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d5d0bac0..7ef35b92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,19 @@ language: scala scala: - - 2.11.7 +- 2.11.8 jdk: - - oraclejdk8 +- oraclejdk8 script: - - sbt test +- sbt test + +before_install: +- openssl aes-256-cbc -K $encrypted_e3665000fc5c_key -iv $encrypted_e3665000fc5c_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 compile publishSigned; + fi +- if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then + echo "Not in master branch, skipping deploy and release"; + fi diff --git a/build.sbt b/build.sbt index 37b40aab..ddc21f1a 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ lazy val stdlib = (project in file(".")) // Distribution -lazy val gpgFolder = sys.env.getOrElse("SE_GPG_FOLDER", ".") +lazy val gpgFolder = sys.env.getOrElse("PGP_FOLDER", ".") lazy val publishSettings = Seq( organizationName := "Scala Exercises", @@ -32,7 +32,7 @@ lazy val publishSettings = Seq( 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("Sonatype Nexus Repository Manager", "oss.sonatype.org", sys.env.getOrElse("PUBLISH_USERNAME", ""), sys.env.getOrElse("PUBLISH_PASSWORD", "")), @@ -47,28 +47,5 @@ lazy val publishSettings = Seq( Some("Snapshots" at nexus + "content/repositories/snapshots") else Some("Releases" at nexus + "service/local/staging/deploy/maven2") - }, - pomExtra := - - - raulraja - Raul Raja - raul@47deg.com - - - dialelo - Alejandro Gómez - al.g.g@47deg.com - - - rafaparadela - Rafa Paradela - rafa.p@47deg.com - - - MasseGuillaume - Guillaume Massé - masgui@gmail.com - - + } ) diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 95aabbb8..00000000 --- a/deploy.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -function decipherKeys { - echo $KEYS_PASSPHRASE | gpg --passphrase-fd 0 keys.tar.gpg - tar xfv keys.tar -} - -function publish { - sbt compile publishSigned -} - -function release { - decipherKeys - publish -} - -if [[ $TRAVIS_BRANCH == 'master' ]]; then - echo "Master branch, releasing..." - release -else - echo "Not in master branch, skipping release" -fi - diff --git a/keys.tar.gpg b/keys.tar.gpg deleted file mode 100644 index 4be048e6fb02288eec523a464d85aba8a93648e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2875 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 diff --git a/pubring.gpg b/pubring.gpg new file mode 100644 index 00000000..c7e3925b --- /dev/null +++ b/pubring.gpg @@ -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----- diff --git a/secring.gpg.enc b/secring.gpg.enc new file mode 100644 index 0000000000000000000000000000000000000000..8640de702ad4c56661a1627c0010565f30f972e1 GIT binary patch literal 1856 zcmV-G2fz5BH$dmjBA>zz{jyiv&gnfRktF8@7N$~gf=D!gF|nF_dz722)4Od?**r?b zL+&T-m29!xByjCM?`}mXp&^1tX;IfZuwECqWaFJiRi8{C(65<~Gz5@4(g?Te4Y3%F z$DF#EXP#1dhC+RxLF4FezmYY52~9m;^BuyQ-S)(q=4^yTz_-nMLH@LcMd(N7M-9^^ zxrwMhg`V+KTV@5wFgvvcS`^W&>&_UYn{F{9pU+I9LDh1BA|!UxLE-L3GJ-U1H!-y>w<2Ef@iUs z%KZA40QE-RAPMW^5UVl@OOt?BOP-Bgm&-*p6}IH5QP$_hYH^=8l26&@FE4C@<=?91`Ya!0LwW z%OE_q(Ga9k(_`-0qlF%+vK#n_}bP8GoEJqwxa1~qzF?{^+* z0^HM{XB;erX>x#OZohper23>or|bqY@`p>SflcxhgS(qNDaTvzW77E93c$N%25PnV zXLgF`)4|q;;8#zv7Aitvrsk}sFSr7oC46Pj3+Bym3@7QbK8Sj_ub8fi!>&SkZ!iz*#dw6P-$;;$!qtn>;lCRHEVsuhoc)fxX7Jt}{x zC@=*a}5v*{H!M zvi_O=Zd3i;1ND=|$veiZP@N+Y%KcdF(_dhN*4Ik>8{G)p!9$gV=#xHX_#_HqQR&s9 z0?A3Wj+OL)_&%XzN?aQ9`2y!4yq@c!N_iVmy*77z$TZ6YQ7!kdZJl0qRLf^dqY zW53p}!RKSO+t?c&`-$)C%Y~4HJ)xe_T7arpPc;s*BPWQnM{s_r zJ-PMkknH$^L*oe6Hl#}B3KdaEe5R6a=<&h{|6lLkRePhy`8o$6)pPhgm0*?YWUXU} z!RGkZM5dontB!93o*Q33Y4BiKd|0}@JM1PI)Xwov+`wXdJLO6S!4~_zmXXkJU)i$N z)Q3)8;af&YbnSIP&>>F9Ah?Q za+ap0c7SQwFLP(ti1=Q&Im(wU6oUUe}!SxKP?dH3~kQ=M7Hh4<_rAaAfdW`ug|c8m}ZC9a%> zaKp%876_-14b93dqtr-VF}z?#kMkv+PLd-4NG>klyB@iS-SrBVq%lK5ZTN0%5r!*E z#psmhT1yxSR(zl-4)JEW2*r>!Pbl}he0$vHFs{V0iU z3mo{eZF6Nu<}=bSpa^(c`Xf@+g{f{2o5sL%QGy7i;cyj2=hAvM+QBffP1E@Cq8C`V uIy#y<@)?rVkIs=+3Kh3#w)tD>UBP$?f;nnF-4CV67;gN;6#m*Gm%=)H?XI%` literal 0 HcmV?d00001 From 7731490106e5e5531c8bc4ecf4c38c4a60a39367 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Mon, 26 Dec 2016 10:44:08 +0100 Subject: [PATCH 2/2] Decrypting keys only in master branch --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ef35b92..043835a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ script: - sbt test before_install: -- openssl aes-256-cbc -K $encrypted_e3665000fc5c_key -iv $encrypted_e3665000fc5c_iv - -in secring.gpg.enc -out secring.gpg -d +- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then + openssl aes-256-cbc -K $encrypted_e3665000fc5c_key -iv $encrypted_e3665000fc5c_iv -in secring.gpg.enc -out secring.gpg -d; + fi after_success: - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then