Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions .github/workflows/call-build-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@ jobs:
strategy:
matrix:
include:
- id: "fabric"
task: ":instances:fabric:build"
- id: "forge"
task: ":instances:forge:build"
- id: "velocity"
task: ":instances:velocity:build"
- id: "bukkit"
task: ":instances:bukkit:build"
- id: "forge"
task: ":instances:forge:build"
- id: "neoforge"
task: ":instances:neoforge:build"
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'adopt'
java-version: 21
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/call-detekt-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
name: "Check project by detekt"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/call-gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
name: "Gradle Wrapper Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v3
4 changes: 2 additions & 2 deletions .github/workflows/call-tests-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
name: "Run tests"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'adopt'
java-version: '21'
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/call-upload-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,22 @@ jobs:
strategy:
matrix:
include:
- id: "fabric"
task: ":instances:fabric:assemble"
- id: "forge"
task: ":instances:forge:shadowJar"
- id: "velocity"
task: ":instances:velocity:shadowJar"
- id: "bukkit"
task: ":instances:bukkit:shadowJar"
- id: "forge"
task: ":instances:forge:shadowJar"
- id: "neoforge"
task: ":instances:neoforge:shadowJar"
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- uses: christian-draeger/read-properties@1.1.1
id: properties
with:
path: './gradle.properties'
properties: 'makeevrserg.project.name'
properties: 'klibs.project.name'
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'adopt'
java-version: 21
Expand All @@ -35,8 +33,8 @@ jobs:
uses: gradle/gradle-build-action@v3
with:
arguments: ${{ matrix.task }} --stacktrace
- uses: actions/upload-artifact@184d73b71b93c222403b2e7f1ffebe4508014249
- uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
name: "Upload ${{ matrix.id }}"
with:
name: ${{ matrix.id }}
path: ./jars/${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }}*.jar
path: ./jars/${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }}*.jar
29 changes: 12 additions & 17 deletions .github/workflows/call-upload-github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,28 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- uses: christian-draeger/read-properties@1.1.1
id: properties
with:
path: './gradle.properties'
properties: 'makeevrserg.project.name makeevrserg.project.version.string'
properties: 'klibs.project.name klibs.project.version.string'

- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
name: "Download velocity"
- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
name: "Download bukkit"
with:
name: velocity
name: bukkit
path: ./jars
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
name: "Download forge"
with:
name: forge
path: ./jars
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
name: "Download fabric"
with:
name: fabric
name: bungee
path: ./jars
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
name: "Download bukkit"
- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
name: "Download neoforge"
with:
name: bukkit
name: bungee
path: ./jars

- name: Create release
Expand All @@ -47,7 +42,7 @@ jobs:
with:
files: |
./jars/*.jar
tag_name: ${{ steps.properties.outputs.makeevrserg-project-version-string }}
name: ${{ steps.properties.outputs.makeevrserg-project-name }} - ${{ steps.properties.outputs.makeevrserg-project-version-string }}
tag_name: ${{ steps.properties.outputs.klibs-project-version-string }}
name: ${{ steps.properties.outputs.klibs-project-name }} - ${{ steps.properties.outputs.klibs-project-version-string }}
draft: false
prerelease: false
16 changes: 5 additions & 11 deletions .github/workflows/call-upload-modrinth-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,19 @@ jobs:
strategy:
matrix:
include:
- id: "fabric"
task: ":instances:fabric:assemble"
- id: "forge"
task: ":instances:forge:shadowJar"
- id: "velocity"
task: ":instances:velocity:shadowJar"
- id: "bukkit"
task: ":instances:bukkit:shadowJar"
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- uses: christian-draeger/read-properties@1.1.1
id: properties
with:
path: './gradle.properties'
properties: 'makeevrserg.project.name makeevrserg.project.version.string'
properties: 'klibs.project.name klibs.project.version.string'

- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
name: "Download ${{ matrix.id }}"
with:
name: ${{ matrix.id }}
Expand All @@ -40,8 +34,8 @@ jobs:
# your assets on Modrinth.
modrinth-id: 6NpNwzA1
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
name: ${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }}
version: ${{ steps.properties.outputs.makeevrserg-project-version-string }}
name: ${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }}
version: ${{ steps.properties.outputs.klibs-project-version-string }}
changelog: ${{ join(github.event.commits.*.message, '\n') }}
version_type: beta
java: |
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ jobs:
uses: ./.github/workflows/call-upload-github-release.yml
secrets:
ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}

upload_modrinth_artifacts:
needs: [ upload_artifacts ]
uses: ./.github/workflows/call-upload-modrinth-release.yml
secrets:
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
12 changes: 2 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
.kotlin
astra.properties
local.properties
build
**/build/*
**/runs/*
jars
# modules
modules/api-local/build
modules/api-remote/build
modules/dto/build
# instances
instances/fabric/build
instances/forge/build
instances/plugin/build
instances/velocity/build
Loading
Loading