From 17f981f81e6b54c32132ee5a6b5bead0f2b06568 Mon Sep 17 00:00:00 2001
From: childish-sambino <sharrison@twilio.com>
Date: Thu, 14 Nov 2019 14:34:12 -0600
Subject: [PATCH 1/2] Allow missing GPG env vars when running on a fork (#1)

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7cf57f43e..a9bccb4bac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: java
 sudo: false
-## export GPG details
 before_install:
   - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
-  - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
+  - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import || true
   - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
 matrix:
   include:
@@ -39,7 +38,7 @@ notifications:
       - secure: MkRPjhMDkLMT0tKhSzSAEEdLxKlFrcEw00FBgpcpIl50kSpe3gxCJsm2bz5+LySblCfY1nI5D1+R++eB5cxJzgZvEBWIXQnGJVAV+X7WW1CI1FBZlv6FNLBe5gVPPzo5kIIM1g3o7AaERcraHK9h9S9N8cpnBRHe+Xf6wTRqmwo=
       - secure: iRd6XcgHGFSJ/eS1ZwCUgUVTK0a+JAPmyPEx/OdFbma6DvF8WBhWtW5Q1dyrjQ3JWU8DW2Att9jRnGHd9F5wWWcykxYbD9DXrlfqCZpec9pHzEMAud9MG1PqK0d3y2oyjwps/fQ092PJcn9/y7zX6tzdVWKaKUe4iRDs1u1ehUo=
 install:
-    - mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
+  - mvn --settings .maven.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
 deploy:
   - provider: script
     script: make docker-build && make docker-push
@@ -52,4 +51,4 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
-      jdk: openjdk8
\ No newline at end of file
+      jdk: openjdk8

From 8506f25f6fcc391f5bad9ae5ce9895a0eca36428 Mon Sep 17 00:00:00 2001
From: childish-sambino <sharrison@twilio.com>
Date: Thu, 14 Nov 2019 15:45:48 -0600
Subject: [PATCH 2/2] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a9bccb4bac..e058ff8f0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 before_install:
   - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
   - echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import || true
-  - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
+  - echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust || true
 matrix:
   include:
 # OpenJDK