Skip to content

Commit

Permalink
[CI skip] Merge remote-tracking branch 'TheBusyBiscuit/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
xMikux committed Jul 25, 2023
2 parents 31f1317 + b28bb3a commit adcc8d0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ on:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2.3.4
- name: Set up JDK 1.8
uses: actions/setup-java@v2.1.0
- uses: actions/checkout@v3.5.3
- name: Set up JDK 16
uses: actions/setup-java@v3.11.0
with:
java-version: '8'
distribution: 'adopt'
java-version: 16
distribution: temurin
- name: Build with Maven
run: mvn package --file pom.xml
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.5.0</version>

<configuration>

Expand Down

0 comments on commit adcc8d0

Please sign in to comment.