aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml10
-rw-r--r--.github/workflows/test.yml32
2 files changed, 5 insertions, 37 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40d732e..53f8a45 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
name: Java CI with Gradle
-on: [ push ]
+on: [ push, pull_request ]
jobs:
build:
@@ -11,14 +11,14 @@ jobs:
fail-fast: true
steps:
- name: Checkout
- uses: actions/checkout@v2.3.5
+ uses: actions/checkout@v2.4.0
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v2.3.1
+ uses: actions/setup-java@v2.5.0
with:
distribution: adopt
java-version: ${{ matrix.java }}
- name: Cache Gradle
- uses: actions/cache@v2.1.6
+ uses: actions/cache@v2.1.7
with:
path: ~/.gradle
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
@@ -26,7 +26,7 @@ jobs:
- name: Build LimboAuth
run: ./gradlew build
- name: Upload LimboAuth
- uses: actions/upload-artifact@v2.2.4
+ uses: actions/upload-artifact@v2.3.1
with:
name: LimboAuth Built On ${{ matrix.java }} JDK
path: "build/libs/limboauth*.jar"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 6259d74..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Java CI with Gradle [PR tests]
-
-on: [ pull_request ]
-
-jobs:
- build:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- java: [ 11, 16 ]
- fail-fast: true
- steps:
- - name: Checkout
- uses: actions/checkout@v2.3.5
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v2.3.1
- with:
- distribution: adopt
- java-version: ${{ matrix.java }}
- - name: Cache Gradle
- uses: actions/cache@v2.1.6
- with:
- path: ~/.gradle
- key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
- restore-keys: ${{ runner.os }}-gradle-
- - name: Build LimboAuth
- run: ./gradlew build
- - name: Upload LimboAuth
- uses: actions/upload-artifact@v2.2.4
- with:
- name: LimboAuth Built On ${{ matrix.java }} JDK
- path: "build/libs/limboauth*.jar"