From 9ca43664b0bb91e7e0544f3050ccef5c958b19a2 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Thu, 12 Nov 2020 01:22:04 -0500 Subject: [PATCH] Abandon travis-ci for jenkins --- .ci/Jenkinsfile | 42 ++++++++++++++++++++++++++++++++++++++++++ .ci/build.sh | 25 +++++++++++++++++++++++++ .travis-settings.xml | 9 --------- .travis.yml | 28 ---------------------------- readme.md | 3 +++ 5 files changed, 70 insertions(+), 37 deletions(-) create mode 100644 .ci/Jenkinsfile create mode 100755 .ci/build.sh delete mode 100644 .travis-settings.xml delete mode 100644 .travis.yml diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile new file mode 100644 index 0000000..e283bab --- /dev/null +++ b/.ci/Jenkinsfile @@ -0,0 +1,42 @@ +properties( + [ + disableConcurrentBuilds() + ] +) + +node('linux && docker') { + try { + stage('Checkout') { + //branch name from Jenkins environment variables + echo "My branch is: ${env.BRANCH_NAME}" + + // this doesn't grab tags pointing to this branch + //checkout scm + // this hack does... https://issues.jenkins.io/browse/JENKINS-45164 + checkout([ + $class: 'GitSCM', + branches: [[name: 'refs/heads/'+env.BRANCH_NAME]], + extensions: [[$class: 'CloneOption', noTags: false, shallow: false, depth: 0, reference: '']], + userRemoteConfigs: scm.userRemoteConfigs, + ]) + sh ''' + set -euxo pipefail + git checkout "$BRANCH_NAME" -- + git reset --hard "origin/$BRANCH_NAME" + ''' + } + + stage('Build + Deploy') { + sh 'curl --compressed -sL https://code.moparisthebest.com/moparisthebest/self-ci/raw/branch/master/build-ci.sh | bash' + } + + currentBuild.result = 'SUCCESS' + } catch (Exception err) { + currentBuild.result = 'FAILURE' + } finally { + stage('Email') { + step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'admin.jenkins@moparisthebest.com', sendToIndividuals: true]) + } + deleteDir() + } +} diff --git a/.ci/build.sh b/.ci/build.sh new file mode 100755 index 0000000..b660955 --- /dev/null +++ b/.ci/build.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -euxo pipefail + +[ $JAVA_VERSION -lt 8 ] && echo "build does not support JAVA_VERSION: $JAVA_VERSION" && exit 0 + +echo "starting build for JAVA_VERSION: $JAVA_VERSION" + +# install deps +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V + +# clean and test +mvn clean test -B + +# publish only from java 8 and master branch +if [ "$BRANCH_NAME" == "master" -a $JAVA_VERSION -eq 8 ] +then + echo 'deploying to maven' + mvn deploy -Dmaven.test.skip=true -B + + mkdir -p release + mv './jDnsProxy-all/target/jDnsProxy-all.jar' 'release/jDnsProxy.jar' +fi + +echo 'build success!' +exit 0 diff --git a/.travis-settings.xml b/.travis-settings.xml deleted file mode 100644 index a9a9c68..0000000 --- a/.travis-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - sonatype-nexus-snapshots - ${env.SONATYPE_USERNAME} - ${env.SONATYPE_PASSWORD} - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9f52a2b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: java -sudo: false - -matrix: - include: - - env: JDK='OpenJDK 8' - jdk: openjdk8 - - env: JDK='OracleJDK 8' - jdk: oraclejdk8 - - env: JDK='OpenJDK 9' - install: . ./install-jdk.sh -F 9 -L GPL - - env: JDK='OracleJDK 9' - jdk: oraclejdk9 - - env: JDK='OpenJDK 10' - install: . ./install-jdk.sh -F 10 -L GPL - - env: JDK='OpenJDK 11' - install: . ./install-jdk.sh -F 11 -L GPL - - env: JDK='OpenJDK 12' - install: . ./install-jdk.sh -F 12 -L GPL - - env: JDK='OpenJDK 13' - install: . ./install-jdk.sh -F 13 -L GPL - -before_install: wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh - -after_success: - - if [[ "${JDK}" == 'OpenJDK 8' ]]; then - mvn deploy --settings .travis-settings.xml -Dmaven.test.skip=true -B || travis_terminate 1; - fi diff --git a/readme.md b/readme.md index 0583280..75dd28c 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,8 @@ jDnsProxy --------- + +[![Build Status](https://ci.moparisthe.best/job/moparisthebest/job/jDnsProxy/job/master/badge/icon%3Fstyle=plastic)](https://ci.moparisthe.best/job/moparisthebest/job/jDnsProxy/job/master/) + Simple fast and lightweight DNS proxy and cache that listens on TCP or UDP ports and relays the request to various upstream [DNS-over-TCP](https://tools.ietf.org/html/rfc1035), [DNS-over-TLS](https://tools.ietf.org/html/rfc7858), or [DNS-over-HTTPS](https://tools.ietf.org/html/draft-hoffman-dns-over-https) servers, optionally over http or socks