diff --git a/.gitignore b/.gitignore index b6b15f2ba06c1db48e9c5bd9c21381fe1f75346a..351ac0152b742f1f3218a8e572b41465c9a92497 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ atlassian-ide-plugin.xml # NetBeans specific files/directories .nbattrs + +# publishing secrets +secrets/signing-key diff --git a/.travis.yml b/.travis.yml index 492f04b7ec00f4513b2b2ad1e206bfc5f6bbef37..fc42c36faf35432bf76ec67fa505dd81a9f64378 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,12 @@ install: "./installViaTravis.sh" script: "./buildViaTravis.sh" env: global: - - secure: mprd3lRQDzNFIqWJ/hhHt84Oo1rQFv5Hp2GyySTx/xPiu2Qv6F+C0YOHTHIT2+BxxW/7580w/8e6L8YLxiVX0d2J8YwQm7tPoc4WN3kV9K6U/LTdVmNAePNyeMq1R13CPAguDVG2CY4+Y08rdU7OYDuL1mQFHzPmvhGzLnN4kiE= - - secure: INE6Zlu2EMfRZI13F8B4RyKkmvtaMA8K5bMYwRPWDJ+PUnGUfU27xIjx8mY+dd6A2JfSeeoF7dkOko4xi+PiiayY2Byi8fneja1j01Du7l0okBaeROGlLscLid2ME0yDCql06vERhCdIDEBMpZzVu8GbqpZ1z/x0JQ0YgBiMVEc= - - secure: OumwxBfa3lOrT2BHRx9a9Ppxiua0IbEtRFs2CQHCWOW6iYRLDavLqya+oMPvx+gAlZRX54VTYuuxh858dxR8O94xPi4NvZ/POvoTdgU1MNekBqYsuWys3B4Dw8CMrrpfzvtD8tWe8TkgwGpzzpRuEzQ6bvh0uCAmiQ0kQhKA8+0= - - secure: TeSjCxSjlH0fE30WoBWOPIWPMMn66v6KGAMbUGPO1Z98q1AXptmcFnAob0of8Q/HLkR6Paxtl4r4yt35pqakw40M6s5w4O2PeXPArZZE+qBRR9izRpXIPq+jAIZwabYkEgLMhF3u3VOIYmP94hGvFfddtuTF8UmqkEeK1/AmruU= + - secure: EKzKmfCI/HzvxH7f9Y2YllaKkTDs5rCJyyd0MZ30ZlwjeExF0SFOum9lyu6ujbZEJrW3ybfJ8YEmUJwawo857eSbjOfhJ0NB+mC5W7ItlOYHV3q2jGmAGdgWQQYij3YtFel+mA/BsxmvVh/fgLz4UJ40dFD0wbvX8wKQ7iNkkDQ= + - secure: ENxhFcR6dj3bSecQES9/Hf2hOo2uQP7BARIfQtaxd2+kUQLLKIE7Ik7ldds7bYWO4q/AOLbgQbbggLldCC48uv7e3G8XJY1L9NierSkdV0gxPK5gR1Wqt1OZQXdQVuaSNLTur560YN5qD+7hpeiO3IViD72uuhWNKB5D7HaQVHY= + - secure: qSuKX/JeiB2I6KXo8xuQsaerx9BrTfhQMuqpmhCVlhITH2TQYUf6iLDoh8/rIMfD1HT8Y3oTinVk6++mjEtMzxdqgrPrUtznXiOktx+8feClcymJ/T2FA0opHlfteauszc/PUE0ItNQm2Ci3rWf2T7r8MU7rQkVzC8nk3KHqySQ= + - secure: p4/UI+OCh02Vxavz3Jc24z9JS45uWh63JgAWRQobX2zw1qjFGHzoOnuC/N8TE+CXVwMK7cvWkykZUi8BCAlloiIfLtQ+xeTqtez+S/y0siyyCBANAVIE5m/tMyssni1zWqdYWFPh0lY87zp7A/yC7zo9L1uoeWEGZOiqIpVggdE= + - secure: HOC6j+YkpjGHhk4lE7/1q+tNmNLgksrpS8gx7ijfR/tcKagToznPG2RH6fjMJYQ8cw7Njp9oMCCAuaOxKLPioxb4fEGILnB+ZitvVDc3aqOSDN2pWIE2wZPzzvqyKPBd4BQFCJXNlo8kyJPGN78dm7e6I0rpYWB3QBTkjFJJA+E= + - secure: fP8b3J1LhxPEQrz7I1kLhW79Ax3LJmceuJkx2Cr/WjaV21jR2u+KVP3Fg9aVo5ECgJsenC28cYl7YitogHLl4bfpJVLnMtySzkMF2A7dHuR9semnliqCBcClgxwvX2k/1eUFSBdHkOucy6ZJelCzitvhJ9jQcQFSx6D5SoIUSZk= cache: directories: - "$HOME/.gradle/caches" diff --git a/buildViaTravis.sh b/buildViaTravis.sh index 17a33a5fb98f40f9f2c377239666c666dd6988d3..36b9f97b36d758151bbe7a327b98bbe61702ea47 100755 --- a/buildViaTravis.sh +++ b/buildViaTravis.sh @@ -6,18 +6,20 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./gradlew build elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']' - ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot + ./gradlew -Prelease.travisci=true -PnetflixOss.username="$NETFLIX_OSS_REPO_USERNAME" -PnetflixOss.password="$NETFLIX_OSS_REPO_PASSWORD" -Psonatype.signingPassword="$NETFLIX_OSS_SIGNING_PASSWORD" build snapshot elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']' case "$TRAVIS_TAG" in *-rc\.*) - ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate + ./gradlew -Prelease.travisci=true -PnetflixOss.username="$NETFLIX_OSS_REPO_USERNAME" -PnetflixOss.password="$NETFLIX_OSS_REPO_PASSWORD" -Psonatype.signingPassword="$NETFLIX_OSS_SIGNING_PASSWORD" -Prelease.useLastTag=true candidate ;; *) - ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final + ./gradlew -Prelease.travisci=true -PnetflixOss.username="$NETFLIX_OSS_REPO_USERNAME" -PnetflixOss.password="$NETFLIX_OSS_REPO_PASSWORD" -Psonatype.username="$NETFLIX_OSS_SONATYPE_USERNAME" -Psonatype.password="$NETFLIX_OSS_SONATYPE_PASSWORD" -Psonatype.signingPassword="$NETFLIX_OSS_SIGNING_PASSWORD" -Prelease.useLastTag=true final ;; esac else echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']' ./gradlew build fi + + diff --git a/installViaTravis.sh b/installViaTravis.sh index 68e45a05f5b8e8e0b5b62235e440925ead122ce3..82cf1b8803368b465dbec3a7269319a1582159a1 100755 --- a/installViaTravis.sh +++ b/installViaTravis.sh @@ -1,16 +1,7 @@ #!/bin/bash # This script will build the project. -if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - echo -e "Assemble Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]" - ./gradlew assemble -elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then - echo -e 'Assemble Branch with Snapshot => Branch ['$TRAVIS_BRANCH']' - ./gradlew -Prelease.travisci=true assemble -elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then - echo -e 'Assemble Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']' - ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true assemble -else - echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']' - ./gradlew assemble +if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then + echo "Decrypting publishing credentials" + openssl aes-256-cbc -k "$NETFLIX_OSS_SIGNING_FILE_PASSWORD" -in secrets/signing-key.enc -out secrets/signing-key -d fi diff --git a/secrets/signing-key.enc b/secrets/signing-key.enc new file mode 100644 index 0000000000000000000000000000000000000000..2fc4c8f9b02c4cf64c95566ae7d154de7be73a0d Binary files /dev/null and b/secrets/signing-key.enc differ