From cd11b56a7266408bc726d37d42fc1bc23e58919c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 27 Apr 2021 12:17:26 -0400 Subject: [PATCH 1/2] [ci-skip] re-add java 15 to github actions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2bdd3dfa..247818a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '11', '16' ] + java: [ '8', '11', '15', '16' ] fail-fast: false steps: - uses: actions/checkout@v2 From ef9ed2f890bd1167fb8f2556f7a53b85360cadde Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 27 Apr 2021 12:23:08 -0400 Subject: [PATCH 2/2] [ci-skip] fix .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index ebebf97d..1b741032 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,7 +24,7 @@ Jenkinsfile text eol=lf *.md text diff=markdown # Windows Files -*.bat text eol=crlf +# *.bat text eol=crlf #causes issues on linux for some reason *.cmd text eol=crlf # Binary files