From 04bd147fba11bdf1cac26aba1d64d189e0867a3f Mon Sep 17 00:00:00 2001 From: Kevin Davis Date: Wed, 23 Dec 2020 10:44:52 -0500 Subject: [PATCH] Remove TravisCI (#1337) * Remove TravisCI With the migration to CircleCI complete, this change removes the Travis CI configurations that are no longer needed. * Correcting License Headers --- .circleci/config.yml | 4 +- .travis.yml | 45 ------ RELEASE.md | 50 +++---- {travis => scripts}/no-git-changes.sh | 2 +- {travis => scripts}/release.sh | 2 +- travis/codesigning.asc.enc | Bin 9360 -> 0 bytes travis/publish.sh | 196 -------------------------- travis/settings.xml | 41 ------ travis/sign.sh | 21 --- 9 files changed, 25 insertions(+), 336 deletions(-) delete mode 100644 .travis.yml rename {travis => scripts}/no-git-changes.sh (95%) mode change 100755 => 100644 rename {travis => scripts}/release.sh (94%) mode change 100755 => 100644 delete mode 100644 travis/codesigning.asc.enc delete mode 100755 travis/publish.sh delete mode 100644 travis/settings.xml delete mode 100755 travis/sign.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 108a3449..a3aa95c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ jobs: - image: circleci/openjdk:14-buster <<: *defaults - deploy-snapshot: + deploy: docker: - image: circleci/openjdk:8 steps: @@ -82,7 +82,7 @@ workflows: - jdk8 - jdk11 - jdk14 - - deploy-snapshot: + - deploy: requires: - jdk8 - jdk11 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8fc9250b..00000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +0,0 @@ -dist: xenial -language: java - -cache: - directories: - - $HOME/.m2 - -jdk: - - openjdk8 - - openjdk11 - - openjdk14 - -before_install: ./travis/sign.sh - -script: - - ./mvnw clean install -B - # fail build if there are any local changes to sources - - ./travis/no-git-changes.sh - -jobs: - include: - - stage: snapshot - name: "Deploy Snapshot to OSSRH" - if: branch = master AND type != pull_request AND commit_message !~ /^(prepare release ([0-9\.]+))$/ - jdk: openjdk8 - install: true - script: - - ./mvnw -B -nsu -s ./travis/settings.xml -P release -pl -:feign-benchmark -DskipTests=true deploy - - stage: release - name: "Release to OSSRH and Central" - if: tag =~ /^[0-9\.]+$/ - # there is one module (java-11) that needs to be build and released with JDK 11 - jdk: openjdk8 - install: true - script: - - ./mvnw -B -nsu -s ./travis/settings.xml -P release -pl -:feign-benchmark -DskipTests=true deploy - - stage: release-jdk11 - name: "Release JDK 11 Modules to OSSRH and Central" - if: tag =~ /^[0-9\.]+$/ - jdk: openjdk11 - install: true - script: - # first install the pre-requisite projects, then deploy just the java 11 module - - ./mvnw -B -nsu -s ./travis/settings.xml -P java11 -pl :feign-java11 -am -DskipTests=true install - - ./mvnw -B -nsu -s ./travis/settings.xml -P release,java11 -pl :feign-java11 -DskipTests=true deploy diff --git a/RELEASE.md b/RELEASE.md index b8995d8d..2714f548 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,54 +10,46 @@ This repo uses [semantic versions](http://semver.org/). Please keep this in mind 1. **Push a git tag** - Prepare the next release by running the [release script](travis/release.sh) from a clean checkout of the master branch. + Prepare the next release by running the [release script](scripts/release.sh) from a clean checkout of the master branch. This script will: * Update all versions to the next release. * Tag the release. * Update all versions to the next development version. -1. **Wait for Travis CI** +1. **Wait for CI** - This part is controlled by the [travis configuration](.travis.yml), specifically the `release` stage. Which + This part is controlled by the [CircleCI configuration](.circleci/config.yml), specifically the `deploy` job. Which creates the release artifacts and deploys them to maven central. ## Credentials Credentials of various kind are needed for the release process to work. If you notice something -failing due to unauthorized, re-encrypt them using instructions at the bottom of the `.travis.yml` - -Ex You'll see comments like this: -```yaml -env: - global: - # Ex. travis encrypt BINTRAY_USER=your_github_account - - secure: "VeTO... -``` - -To re-encrypt, you literally run the commands with relevant values and replace the "secure" key with the output: - -```bash -$ travis encrypt BINTRAY_USER=adrianmole -Please add the following to your .travis.yml file: +failing due to unauthorized, you will need to modify the stored values in `Sonatype` [CircleCI Context](https://circleci.com/docs/2.0/contexts/) +for the OpenFeign organization. - secure: "mQnECL+dXc5l9wCYl/wUz+AaYFGt/1G31NAZcTLf2RbhKo8mUenc4hZNjHCEv+4ZvfYLd/NoTNMhTCxmtBMz1q4CahPKLWCZLoRD1ExeXwRymJPIhxZUPzx9yHPHc5dmgrSYOCJLJKJmHiOl9/bJi123456=" -``` +`SONATYPE_USER` - the username of the Sonatype account used to upload artifacts. +`SONATYPE_PASSWORD` - password for the Sonatype account. +`GPG_KEY` - the gpg key used to sign the artifacts. +`GPG_PASSPHRASE` - the passphrase for the gpg key ### Troubleshooting invalid credentials -If you receive a '401 unauthorized' failure from jCenter or Bintray, it is -likely `BINTRAY_USER` or `BINTRAY_KEY` entries are invalid, or possibly the user -associated with them does not have rights to upload. +If the `deploy` job fails due to invalid credentials, double check the `SONATYPE_USER` and `SONATYPE_PASSWORD` +variables first and correct them. -The least destructive test is to try to publish a snapshot manually. By passing -the values Travis would use, you can kick off a snapshot from your laptop. This -is a good way to validate that your unencrypted credentials are authorized. +### Troubleshooting GPG issues -Here's an example of a snapshot deploy with specified credentials. -```bash -$ BINTRAY_USER=adrianmole BINTRAY_KEY=ed6f20bde9123bbb2312b221 TRAVIS_PULL_REQUEST=false TRAVIS_TAG= TRAVIS_BRANCH=master travis/publish.sh +If the `deploy` job fails when signing artifacts, the GPG key may have expired or is incorrect. To update the +`GPG_KEY`, you must export a valid GPG key to ascii and replace all newline characters with `\n`. This will +allow CircleCi to inject the key into the environment in a way where it can be imported again. Use the following command +to generate the key file. + +```shell +gpg -a --export-secret-keys | cat -e | sed | sed 's/\$/\\n/g' > gpg_key.asc ``` +Paste the contents of this file into the `GPG_KEY` variable in the context and try the job again. + ## First release of the year The license plugin verifies license headers of files include a copyright notice indicating the years a file was affected. diff --git a/travis/no-git-changes.sh b/scripts/no-git-changes.sh old mode 100755 new mode 100644 similarity index 95% rename from travis/no-git-changes.sh rename to scripts/no-git-changes.sh index 784199ab..0cc6ea57 --- a/travis/no-git-changes.sh +++ b/scripts/no-git-changes.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2012-2019 The Feign Authors +# Copyright 2012-2020 The Feign Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at diff --git a/travis/release.sh b/scripts/release.sh old mode 100755 new mode 100644 similarity index 94% rename from travis/release.sh rename to scripts/release.sh index 4ba222d4..100398c9 --- a/travis/release.sh +++ b/scripts/release.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2012-2019 The Feign Authors +# Copyright 2012-2020 The Feign Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at diff --git a/travis/codesigning.asc.enc b/travis/codesigning.asc.enc deleted file mode 100644 index 32baf96750306d55856345cef330dd71bf45cc5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9360 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

}nEh)aq!ub}VJ=)Y7Atc+&_2vYM zOpjZ3l1(ae5{X<)y0v{a^6ov2K`Uv&iBf-!p5wKPWa=ixI$x`5kSX_UokTbLH+ixf z7o@m}N--{`Z~8~pKhu6ucaWgPgp&{y$$@aNn`7?2nZQ3_e*B*poFNB666!545quZ1 z(DRfUZsl-JQ;0vISAT6zuCsSGW|(3z>@W*c;5?R-GS*l@99$|p{D#Lj`Pc)k6>@B5 z0*%UCmE^|GM+jRkYr)*tt$r~E@p%Dz^v8(Q)`a1njL7>cBGC}n<4TVEi=3t(P>BEE3kpw?6 zx3OWTuT4}h2z0xijFP9Xwte)3yc7ctK9heqLfDY zESFbiJV&iw1-=eSuYY%^gkz~!7Cl>c&r>)ksSqugg!qgH>^;tp8`I$I^0>*TVQ~;* zNou#?;kS`qJ;NNowlW^BNY;ba8 zb=b~YCI7B@4>xomTQ!s}S_n6D<-c0_`{CTCv9r6=W4&?)j>PL?dFEHPVyG>tCo$(z K$ayvNvvlZuGBZs8 diff --git a/travis/publish.sh b/travis/publish.sh deleted file mode 100755 index db8b5c59..00000000 --- a/travis/publish.sh +++ /dev/null @@ -1,196 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2012-2019 The Feign Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. -# - -# taken from OpenZipkin - -set -euo pipefail -set -x - -build_started_by_tag() { - if [ "${TRAVIS_TAG}" == "" ]; then - echo "[Publishing] This build was not started by a tag, publishing snapshot" - return 1 - else - echo "[Publishing] This build was started by the tag ${TRAVIS_TAG}, publishing release" - return 0 - fi -} - -is_pull_request() { - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then - echo "[Not Publishing] This is a Pull Request" - return 0 - else - echo "[Publishing] This is not a Pull Request" - return 1 - fi -} - -is_travis_branch_master() { - if [ "${TRAVIS_BRANCH}" = master ]; then - echo "[Publishing] Travis branch is master" - return 0 - else - echo "[Not Publishing] Travis branch is not master" - return 1 - fi -} - -check_travis_branch_equals_travis_tag() { - #Weird comparison comparing branch to tag because when you 'git push --tags' - #the branch somehow becomes the tag value - #github issue: https://github.com/travis-ci/travis-ci/issues/1675 - if [ "${TRAVIS_BRANCH}" != "${TRAVIS_TAG}" ]; then - echo "Travis branch does not equal Travis tag, which it should, bailing out." - echo " github issue: https://github.com/travis-ci/travis-ci/issues/1675" - exit 1 - else - echo "[Publishing] Branch (${TRAVIS_BRANCH}) same as Tag (${TRAVIS_TAG})" - fi -} - -check_release_tag() { - tag="${TRAVIS_TAG}" - if [[ "$tag" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$ ]]; then - echo "Build started by version tag $tag. During the release process tags like this" - echo "are created by the 'release' Maven plugin. Nothing to do here." - exit 0 - elif [[ ! "$tag" =~ ^release-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$ ]]; then - echo "You must specify a tag of the format 'release-0.0.0' to release this project." - echo "The provided tag ${tag} doesn't match that. Aborting." - exit 1 - fi -} - -print_project_version() { - ./mvnw help:evaluate -N -Dexpression=project.version|sed -n '/^[0-9]/p' -} - -is_release_commit() { - project_version="$(print_project_version)" - if [[ "$project_version" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$ ]]; then - echo "Build started by release commit $project_version. Will synchronize to maven central." - return 0 - else - return 1 - fi -} - -release_version() { - echo "${TRAVIS_TAG}" | sed 's/^release-//' -} - -safe_checkout_master() { - # We need to be on a branch for release:perform to be able to create commits, and we want that branch to be master. - # But we also want to make sure that we build and release exactly the tagged version, so we verify that the remote - # master is where our tag is. - git checkout -B master - git fetch origin master:origin/master - commit_local_master="$(git show --pretty='format:%H' master)" - commit_remote_master="$(git show --pretty='format:%H' origin/master)" - if [ "$commit_local_master" != "$commit_remote_master" ]; then - echo "Master on remote 'origin' has commits since the version under release, aborting" - exit 1 - fi -} - -javadoc_to_gh_pages() { - version="$(print_project_version)" - rm -rf javadoc-builddir - builddir="javadoc-builddir/$version" - - # Collect javadoc for all modules - for jar in $(find . -name "*${version}-javadoc.jar"); do - module="$(echo "$jar" | sed "s~.*/\(.*\)-${version}-javadoc.jar~\1~")" - this_builddir="$builddir/$module" - if [ -d "$this_builddir" ]; then - # Skip modules we've already processed. - # We may find multiple instances of the same javadoc jar because of, for instance, - # integration tests copying jars around. - continue - fi - mkdir -p "$this_builddir" - unzip "$jar" -d "$this_builddir" - # Build a simple module-level index - echo "

  • ${module}
    • " >> "${builddir}/index.html" - done - - # Update gh-pages - git fetch origin gh-pages:gh-pages - git checkout gh-pages - rm -rf "$version" - mv "javadoc-builddir/$version" ./ - rm -rf "javadoc-builddir" - - # Update simple version-level index - if ! grep "$version" index.html 2>/dev/null; then - echo "
  • ${version}
    • " >> index.html - fi - - # Ensure links are ordered by versions, latest on top - sort -rV index.html > index.html.sorted - mv index.html.sorted index.html - - git add "$version" - git add index.html - git commit -m "Automatically updated javadocs for $version" - git push origin gh-pages -} - -#---------------------- -# MAIN -#---------------------- - -if ! is_pull_request && build_started_by_tag; then - check_travis_branch_equals_travis_tag - check_release_tag -fi - -# skip license on travis due to #1512 -./mvnw install -nsu -Dlicense.skip=true - -# formatter errors: -if [ -z $(git status --porcelain) ]; -then - echo "No changes detected, all good" -else - echo "The following files have formatting changes:" - git status --porcelain - echo "" - echo "Please run 'mvn clean install' locally to format files" - exit 1 -fi - -# If we are on a pull request, our only job is to run tests, which happened above via ./mvnw install -if is_pull_request; then - true - -# If we are on master, we will deploy the latest snapshot or release version -# - If a release commit fails to deploy for a transient reason, delete the broken version from bintray and click rebuild -elif is_travis_branch_master; then - ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -pl -:feign-benchmark -DskipTests deploy - - # If the deployment succeeded, sync it to Maven Central. Note: this needs to be done once per project, not module, hence -N - if is_release_commit; then - ./mvnw --batch-mode -s ./.settings.xml -nsu -N io.zipkin.centralsync-maven-plugin:centralsync-maven-plugin:sync - javadoc_to_gh_pages - fi - -# If we are on a release tag, the following will update any version references and push a version tag for deployment. -elif build_started_by_tag; then - safe_checkout_master - # skip license on travis due to #1512 - ./mvnw --batch-mode -s ./.settings.xml -Prelease -nsu -DreleaseVersion="$(release_version)" -Darguments="-DskipTests -Dlicense.skip=true" release:prepare -fi diff --git a/travis/settings.xml b/travis/settings.xml deleted file mode 100644 index 42e120f8..00000000 --- a/travis/settings.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - ossrh - ${env.SONATYPE_USER} - ${env.SONATYPE_PASSWORD} - - - - - ossrh - - true - - - gpg - ${env.GPG_KEYNAME} - ${env.GPG_PASSPHRASE} - - - - - diff --git a/travis/sign.sh b/travis/sign.sh deleted file mode 100755 index b92e56f8..00000000 --- a/travis/sign.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2012-2019 The Feign Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. -# - -# skip signing when building pull requests -if [[ "$TRAVIS_PULL_REQUEST" = "false" ]]; then - echo "[ENVIRONMENT] Preparing Signing Signatures" - openssl aes-256-cbc -K $encrypted_8beb152aadd6_key -iv $encrypted_8beb152aadd6_iv -in travis/codesigning.asc.enc -out travis/codesigning.asc -d - gpg --fast-import travis/codesigning.asc -fi \ No newline at end of file