Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from Sefiraat:master #33

Merged
merged 19 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b09e599
Bump Slimefun version
Sefiraat Jun 13, 2024
9d7708f
Merge pull request #178 from Sefiraat/bump_slimefun
Sefiraat Jun 13, 2024
e7ab7ee
Update dependency com.bgsoftware:WildChestsAPI to v2024
renovate[bot] Jun 13, 2024
f7fb6dd
Update dependency org.projectlombok:lombok to v1.18.32
renovate[bot] Jun 13, 2024
b20a392
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.2.012
renovate[bot] Jun 13, 2024
23e8548
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.0
renovate[bot] Jun 13, 2024
8e962ca
Update actions/checkout action to v4
renovate[bot] Jun 13, 2024
833b0e2
Update actions/setup-java action to v4
renovate[bot] Jun 13, 2024
abe9e1b
Merge pull request #175 from Sefiraat/renovate/com.bgsoftware-wildche…
Sefiraat Jun 13, 2024
ff4faa7
Merge pull request #166 from Sefiraat/renovate/actions-setup-java-4.x
Sefiraat Jun 13, 2024
b96c4c2
Merge pull request #158 from Sefiraat/renovate/org.projectlombok-lomb…
Sefiraat Jun 13, 2024
843a7ea
Merge pull request #157 from Sefiraat/renovate/org.apache.maven.plugi…
Sefiraat Jun 13, 2024
fcda25b
Merge pull request #155 from Sefiraat/renovate/actions-checkout-4.x
Sefiraat Jun 13, 2024
b2df5ca
Merge pull request #141 from Sefiraat/renovate/com.gmail.nossr50.mcmm…
Sefiraat Jun 13, 2024
0860a71
Move to blob builds
Sefiraat Jun 14, 2024
a0729a6
change version
Sefiraat Jun 14, 2024
0cd608a
Merge pull request #179 from Sefiraat/blob_builds
Sefiraat Jun 14, 2024
15ca2e7
Update upload.yml
Sefiraat Jun 14, 2024
c8ade0e
Merge pull request #180 from Sefiraat/Sefiraat-patch-1
Sefiraat Jun 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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>MODIFIED_1.2.0</version>
<version>MODIFIED</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
9 changes: 3 additions & 6 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 @@ -59,12 +60,8 @@ public void onEnable() {
}

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();
if (getConfig().getBoolean("auto-update") && getDescription().getVersion().startsWith("Dev")) {
new BlobBuildUpdater(this, getFile(), "Networks", "Dev").start();
}
}

Expand Down