-
Notifications
You must be signed in to change notification settings - Fork 551
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Slimefun:master' into cleanup/commands
- Loading branch information
Showing
94 changed files
with
2,749 additions
and
676 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| docs/adr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Automatically normalize line endings (to LF) for all text-based files. | ||
| * text=auto eol=lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| name: End to End Testing | ||
|
|
||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| artifact-name: | ||
| description: 'Slimefun artifact name' | ||
| required: true | ||
| type: string | ||
|
|
||
| jobs: | ||
| e2e-testing: | ||
| name: End to End Testing | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 5 | ||
|
|
||
| strategy: | ||
| matrix: | ||
| include: | ||
| - mcVersion: '1.16.5' | ||
| javaVersion: '16' | ||
| - mcVersion: '1.17.1' | ||
| javaVersion: '17' | ||
| - mcVersion: '1.18.2' | ||
| javaVersion: '18' | ||
| - mcVersion: '1.19.4' | ||
| javaVersion: '19' | ||
| - mcVersion: 'latest' | ||
| javaVersion: '20' | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up JDK | ||
| uses: actions/[email protected] | ||
| with: | ||
| distribution: temurin | ||
| java-version: ${{ matrix.javaVersion }} | ||
| java-package: jdk | ||
| architecture: x64 | ||
|
|
||
| - name: Setup server | ||
| run: | | ||
| echo 'eula=true' > eula.txt | ||
| mkdir plugins | ||
| - name: Download ${{ matrix.mcVersion }} Paper | ||
| run: | | ||
| VERSION="${{ matrix.mcVersion }}" | ||
| if [ "$VERSION" == "latest" ]; then | ||
| VERSION=$(curl https://api.papermc.io/v2/projects/paper/ -s | jq -r '.versions[-1]') | ||
| fi | ||
| BUILD_JAR=$(curl -s "https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds" \ | ||
| | jq '.builds[-1] | "\(.build) \(.downloads.application.name)"' -r) | ||
| BUILD=$(echo "$BUILD_JAR" | awk '{print $1}') | ||
| JAR_FILE=$(echo "$BUILD_JAR" | awk '{print $2}') | ||
| echo "Downloading... https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds/$BUILD/downloads/$JAR_FILE" | ||
| curl -o paper.jar \ | ||
| "https://api.papermc.io/v2/projects/paper/versions/$VERSION/builds/$BUILD/downloads/$JAR_FILE" | ||
| - name: Download Slimefun | ||
| uses: actions/download-artifact@v3 | ||
| with: | ||
| name: ${{ inputs.artifact-name }} | ||
| path: plugins/ | ||
|
|
||
| - name: Download e2e-tester | ||
| run: | | ||
| curl -o e2e-tester.jar https://preview-builds.walshy.dev/download/e2e-tester/main/latest | ||
| mv e2e-tester.jar plugins/e2e-tester.jar | ||
| - name: Run server | ||
| run: | | ||
| java -jar paper.jar --nogui |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ jobs: | |
| api: '🔧 API' | ||
| compatibility: '🤝 Compatibility' | ||
|
|
||
| - uses: thollander/[email protected].0 | ||
| - uses: thollander/[email protected].3 | ||
| name: Leave a comment about the applied label | ||
| if: ${{ steps.labeller.outputs.applied != 0 }} | ||
| with: | ||
|
|
@@ -40,7 +40,7 @@ jobs: | |
| Your Pull Request was automatically labelled as: "${{ steps.labeller.outputs.applied }}" | ||
| Thank you for contributing to this project! ❤️ | ||
| - uses: thollander/[email protected].0 | ||
| - uses: thollander/[email protected].3 | ||
| name: Leave a comment about our branch naming convention | ||
| if: ${{ steps.labeller.outputs.applied == 0 }} | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: YAML Linter | ||
| uses: ibiqlik/[email protected] | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| /.settings/ | ||
| /.idea/ | ||
| /.vscode/ | ||
| /data-store/ | ||
|
|
||
| dependency-reduced-pom.xml | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.