Skip to content

Commit

Permalink
[ci skip] Merge remote-tracking branch 'Sefiraat/master'
Browse files Browse the repository at this point in the history
定期更新 ,由於建構頁面達到使用限制,需自行建構。
  • Loading branch information
Hyukna committed Jun 16, 2024
2 parents d35d277 + c8ade0e commit b24f880
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 39 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Test Build

on:
pull_request:
branches:
- master

jobs:
build:
name: Build
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4.1.7

- name: Set up JDK 16
uses: actions/setup-java@v4.2.1
with:
java-version: 16
distribution: adopt

- name: Build with Maven
run: mvn package
26 changes: 0 additions & 26 deletions .github/workflows/maven.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/upload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Build and Upload

on:
push:
branches:
- master

jobs:
build:
name: Build and Upload
runs-on: ubuntu-latest
if: contains(github.event.head_commit.message, '[ci skip]') == false

steps:
- uses: actions/checkout@v4.1.7

- name: Set up JDK 16
uses: actions/setup-java@v4.2.1
with:
java-version: 16
distribution: adopt

- name: Build with Maven
run: mvn package

- name: Upload to Builds
uses: WalshyDev/blob-builds/gh-action@main
with:
project: Networks
apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
releaseNotes: ${{ github.event.head_commit.message }}
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.sefiraat</groupId>
<artifactId>networks</artifactId>
<version>Efina_1.2.0</version>
<version>Efina_1.3.0</version>

<distributionManagement>
<repository>
Expand Down Expand Up @@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<configuration>
<relocations>
<relocation>
Expand Down Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>RC-35</version>
<version>03e5b9a</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -173,7 +173,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<version>1.18.32</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -199,13 +199,13 @@
<dependency>
<groupId>com.bgsoftware</groupId>
<artifactId>WildChestsAPI</artifactId>
<version>2023.2</version>
<version>2024.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId>
<version>2.1.221</version>
<version>2.2.012</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/io/github/sefiraat/networks/Networks.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import io.github.sefiraat.networks.slimefun.NetworkSlimefunItems;
import io.github.sefiraat.networks.slimefun.network.NetworkController;
import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
//import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.BlobBuildUpdater;
//import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater;
//import org.bstats.bukkit.Metrics;
//import org.bstats.charts.AdvancedPie;
Expand Down Expand Up @@ -58,13 +59,9 @@ public void onEnable() {
//setupMetrics();
}

/*public void tryUpdate() {
if (getConfig().getBoolean("auto-update")
&& getDescription().getVersion().startsWith("DEV")
) {
String updateLocation = MessageFormat.format("{0}/{1}/{2}", this.username, this.repo, this.branch);
GitHubBuildsUpdater updater = new GitHubBuildsUpdater(this, getFile(), updateLocation);
updater.start();
/* public void tryUpdate() {
if (getConfig().getBoolean("auto-update") && getDescription().getVersion().startsWith("Dev")) {
new BlobBuildUpdater(this, getFile(), "Networks", "Dev").start();
}
}*/

Expand Down

0 comments on commit b24f880

Please sign in to comment.