Skip to content

Commit 39c1779

Browse files
authored
Merge pull request #2783 from BentoBoxWorld/mojang_mapped
Mojang mapped
2 parents a5fcef6 + 663899f commit 39c1779

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1169
-1542
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
name: Build
1+
name: SonarQube
22
on:
33
push:
44
branches:
55
- develop
6-
- master
76
pull_request:
87
types: [opened, synchronize, reopened]
98
jobs:
109
build:
11-
name: Build
10+
name: Build and analyze
1211
runs-on: ubuntu-latest
1312
steps:
1413
- uses: actions/checkout@v4
@@ -17,31 +16,25 @@ jobs:
1716
- name: Set up JDK 21
1817
uses: actions/setup-java@v4
1918
with:
20-
distribution: 'adopt'
21-
java-version: '21'
22-
- name: Cache SonarCloud packages
19+
java-version: 21
20+
distribution: 'zulu' # Alternative distribution options are available
21+
- name: Cache SonarQube packages
2322
uses: actions/cache@v4
2423
with:
2524
path: ~/.sonar/cache
2625
key: ${{ runner.os }}-sonar
2726
restore-keys: ${{ runner.os }}-sonar
28-
- name: Cache Maven packages
27+
- name: Cache Gradle packages
2928
uses: actions/cache@v4
3029
with:
31-
path: ~/.m2
32-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
33-
restore-keys: ${{ runner.os }}-m2
30+
path: ~/.gradle/caches
31+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
32+
restore-keys: ${{ runner.os }}-gradle
33+
34+
- name: Grant execute permission for gradlew
35+
run: chmod +x gradlew
36+
3437
- name: Build and analyze
3538
env:
36-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
3739
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
38-
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BentoBoxWorld_BentoBox
39-
- name: Debug - List target directory
40-
run: ls -la /home/runner/work/BentoBox/BentoBox/target
41-
- run: mvn --batch-mode clean org.jacoco:jacoco-maven-plugin:prepare-agent install
42-
- run: mkdir staging && cp target/*.jar staging
43-
- name: Save artifacts
44-
uses: actions/upload-artifact@v4
45-
with:
46-
name: Package
47-
path: staging
40+
run: ./gradlew build sonar --info

.github/workflows/modrinth-publish.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ $RECYCLE.BIN/
3030
*.log
3131
*.ctxt
3232
.mtj.tmp/
33-
*.jar
3433
*.war
3534
*.nar
3635
*.ear

.paper-nms/1.21.11/mappings_1.21.11.tiny.missing

Whitespace-only changes.

0 commit comments

Comments
 (0)