diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..a9034b0 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,23 @@ +--- +name: build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Build + run: make all diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..7eeb836 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,30 @@ +--- +name: "tagged-release" + +on: + push: + tags: + - "v*" + +jobs: + tagged-release: + name: "Tagged Release" + runs-on: "ubuntu-latest" + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Build + run: make all + - name: Automatic Releases + uses: marvinpinto/action-automatic-releases@v1.2.0 + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + prerelease: false + files: | + LICENSE.txt + build/distributions/*.zip diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d8735f8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -language: java -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ -deploy: - provider: releases - api_key: - secure: ggZfFqoBERauiiTKO/JW+nDmxdL64eIyJfvamH9C6yk2sh8qKyihkReUMMnKWVXBnNWjYyYiX0XmINcKQliwdFapwGHNGN9+muNAeWlktPNNELDwyOujyIBMTrP+PhVeDF8vJ6QqfUjoDpOSvdGQDvBZVwulceBckhIE/Lsut/p1trqb9XAZl/o5Wg6O4bNvL86qvIPQ5dY8JI01YebTcY45zrcbY0WjWy3F5MsRJCDdzI93mgU88Bv7im8yqJVpNrSPihAZkJvdBxZP3m2caxbRTSqAhavBfjz0VjOoP3w9KAa4lNCdZVHJ2BO7LlnaFmV/cHi7uoNUb3zeBz4qGNmNKVmsCBYsB2QgcdwBc7hcY9D2M4mLCsGmkgKRU5UJ8h8Bmk38z2RpEw6XgLfQMlrlVTLe8fWhRmh7YQmZmO/R4ZQtIrBnG3w9c0c6XvuFF1GL62/B/EDCDG04cra0x1Wz6UHZ1kThtkBZAXBy5+tn6HSJzmv8KeQrTDNAwvOG08ouBIisc6W0qFtTh8iUnsT0fedcvgKvdi0eDBqwojlRK4doSwnBO4fDZx1GWMWjO3KSTzSI5oJZzljQev9ngmvDy8jmTVRYYG4eUuYp5BJs5f/bi0BXyEcNlqS6bx06iTMHrd+t4REsWsNa/hgnpMv6ZamWoDdPeyDtUpTUjbw= - file_glob: true - file: build/distributions/* - skip_cleanup: true - on: - tags: true diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1724925 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +GIT_TAG := $(shell git describe --tags 2>/dev/null) + +.PHONY: all +all: + ./gradlew --console plain -Pversion=${GIT_TAG} + +.PHONY: deps +deps: + ./gradlew dependencies diff --git a/README.md b/README.md index 262ce32..c524300 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://travis-ci.org/tomcz/pemToJks.svg?branch=master)](https://travis-ci.org/tomcz/pemToJks) - # PEM to JKS This is a Kotlin command line application that adds PEM-encoded certificates (in X.509 format) @@ -42,7 +40,7 @@ Add a certificate chain and private key to a keystore: NOTE: If the keystore does not exist, it will be created. ``` -$> ./bin/pemToJks -cert cert.pem -key key.pem -alias useme -store test.jks +$> ./bin/pemToJks -cert cert.pem -key key.pem -alias useme -store test.jks Reading certificate file Reading key file Verifying certificate against key @@ -56,7 +54,7 @@ Done ### Requirements -1. Java 8 +1. Java 11 2. Clone this project ### Build the application @@ -64,7 +62,7 @@ Done Run the following from the root of the project: ``` -./gradlew +make all ``` This creates a `build/distributions/pemToJks.zip` application bundle.