Skip to content

Commit efe9375

Browse files
committed
Update GitHub action workflow
Signed-off-by: applenick <applenick@users.noreply.github.com>
1 parent f0b10bc commit efe9375

2 files changed

Lines changed: 17 additions & 26 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,45 +8,36 @@ jobs:
88
environment: deployment
99
steps:
1010
- name: checkout
11-
uses: actions/checkout@v1
12-
- name: setup
13-
uses: actions/setup-java@v1
11+
uses: actions/checkout@v4
12+
- name: setup java
13+
uses: actions/setup-java@v4
1414
with:
15-
java-version: 1.8
16-
- name: cache
17-
uses: actions/cache@v1
15+
java-version: 21
16+
distribution: 'temurin'
17+
- name: cache maven packages
18+
uses: actions/cache@v4
1819
with:
1920
path: ~/.m2/repository
2021
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2122
restore-keys: |
2223
${{ runner.os }}-maven-
23-
- name: build
24+
- name: build with maven
2425
run: mvn --batch-mode --update-snapshots verify
25-
- name: rename file
26+
- name: rename artifact
2627
run: mv target/Database-*.jar Database.jar
27-
- name: release
28+
- name: create release
2829
id: create_release
29-
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/dev')
30-
uses: actions/create-release@v1
31-
env:
32-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'
31+
uses: softprops/action-gh-release@v1
3332
with:
34-
tag_name: Database-${{github.sha}}
35-
release_name: Release ${{github.sha}}
33+
tag_name: Database-${{ github.sha }}
34+
name: Release ${{ github.sha }}
3635
draft: false
3736
prerelease: false
38-
- name: upload asset
39-
id: upload-release-asset
40-
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/dev')
41-
uses: actions/upload-release-asset@v1
37+
files: Database.jar
4238
env:
4339
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
with:
45-
upload_url: ${{ steps.create_release.outputs.upload_url }}
46-
asset_path: ./Database.jar
47-
asset_name: Database.jar
48-
asset_content_type: application/java-archive
49-
- name: deployment
40+
- name: deploy to maven
5041
run: mvn deploy -s settings.xml
5142
env:
5243
REPO_USERNAME: ${{ secrets.REPO_USERNAME }}

src/main/java/tc/oc/occ/database/Database.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tc.oc.occ.database;
22

33
import co.aikar.commands.BukkitCommandManager;
4+
import com.zaxxer.hikari.HikariDataSource;
45
import java.sql.Connection;
56
import java.sql.SQLException;
67
import java.util.Collections;
@@ -13,7 +14,6 @@
1314
import redis.clients.jedis.Jedis;
1415
import tc.oc.occ.database.redis.RedisConfig;
1516
import tc.oc.occ.database.redis.RedisPool;
16-
import com.zaxxer.hikari.HikariDataSource;
1717

1818
public class Database extends JavaPlugin {
1919

0 commit comments

Comments
 (0)