summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Zschocke <f.zschocke+git@gmail.com>2022-02-06 15:25:36 +0100
committerFlorian Zschocke <f.zschocke+git@gmail.com>2022-02-06 15:32:33 +0100
commit113fce858f3806ecdf471b7e5c7f6b0324497003 (patch)
treeae4ff51813a44e52e756fd929aef3c04abf63ecd
parent7150f501495b2294dd4c30355952006747b38846 (diff)
downloadgitblit-113fce858f3806ecdf471b7e5c7f6b0324497003.tar.gz
gitblit-113fce858f3806ecdf471b7e5c7f6b0324497003.zip
ci: Remove Java 7 build
-rw-r--r--.github/workflows/ci-build.yml45
-rw-r--r--.travis.yml1
2 files changed, 24 insertions, 22 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 368123d5..1b1b4844 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -1,4 +1,4 @@
-name: Continous build - build and test on every push
+name: Continous build on every push
on:
push:
@@ -7,12 +7,11 @@ on:
- gh-pages
jobs:
- build:
- name: Build and test
- runs-on: ${{ matrix.os }}
+ build_linux:
+ name: Linux build and test
+ runs-on: ubuntu-latest
strategy:
matrix:
- os: [ubuntu-latest, windows-latest]
java-version: [8, 11]
steps:
@@ -26,39 +25,43 @@ jobs:
with:
java-version: ${{ matrix.java-version }}
+ - name: Setup Moxie
+ run: |
+ wget http://gitblit.github.io/moxie/maven/com/gitblit/moxie/moxie+ant/0.9.4/moxie+ant-0.9.4.tar.gz
+ tar -xzf moxie+ant-0.9.4.tar.gz
+ moxie-0.9.4/bin/moxie -version
+
- name: Report Java version
run: |
java -version
javac -version
- - name: Build with Ant
- run: ant test
+ - name: Build with Moxie
+ run: moxie-0.9.4/bin/moxie test
+
+
+ build_windows:
+ name: Windows build and test
+ runs-on: windows-latest
+ strategy:
+ matrix:
+ java-version: [8, 11]
- build_j7:
- name: Build and test on Java 7
- runs-on: ubuntu-latest
-
steps:
- name: Checkout
uses: actions/checkout@v1
with:
submodules: true
- - name: Setup Java 7
+ - name: Setup Java ${{ matrix.java-version }}
uses: actions/setup-java@v1
with:
- java-version: 7
+ java-version: ${{ matrix.java-version }}
- name: Report Java version
run: |
java -version
javac -version
- - name: Setup Moxie
- run: |
- wget http://gitblit.github.io/moxie/maven/com/gitblit/moxie/moxie+ant/0.9.4/moxie+ant-0.9.4.tar.gz
- tar -xzf moxie+ant-0.9.4.tar.gz
- moxie-0.9.4/bin/moxie -version
-
- - name: Build with Moxie
- run: moxie-0.9.4/bin/moxie test
+ - name: Build with Ant
+ run: ant test
diff --git a/.travis.yml b/.travis.yml
index c02000c7..63f00a90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,5 @@ dist: trusty
language: java
jdk:
- - openjdk7
- openjdk8
- oraclejdk11