Skip to content

Commit 54cce70

Browse files
committed
Revert "update build actions and gradle to use new maven setup"
This reverts commit 49c0206.
1 parent 49c0206 commit 54cce70

3 files changed

Lines changed: 21 additions & 28 deletions

File tree

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dev Build
1+
name: Nightly Build
22

33
on:
44
push:
@@ -32,21 +32,16 @@ jobs:
3232
file: gradle.properties
3333
all: true
3434

35-
- name: Publish dev build to Maven
35+
- name: Publish snapshot to maven
3636
id: upload-maven
37-
run: |
38-
./gradlew publish \
39-
-PmavenType=dev \
40-
-PbuildNumber=${{ github.run_number }} \
41-
-PmavenUsername=${{ secrets.MAVEN_USER }} \
42-
-PmavenPassword=${{ secrets.MAVEN_TOKEN }}
37+
run: ./gradlew publish -PmavenType=snapshots -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}
4338

4439
- name: Rename jar
45-
run: mv build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}.jar build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}-dev.${{ github.run_number }}.jar
40+
run: mv build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}.jar build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}-${{ env.COMMIT_HASH }}.jar
4641

4742
- name: Upload build artifacts
4843
uses: actions/upload-artifact@v4
4944
with:
5045
name: lambda-loader-nightly
51-
path: build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}-dev.${{ github.run_number }}.jar
52-
if-no-files-found: error
46+
path: build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}-${{ env.COMMIT_HASH }}.jar
47+
if-no-files-found: error

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Stable Release
1+
name: Release Lambda Loader
22

33
on:
44
push:
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
publish:
10-
name: Build and publish Lambda Loader
10+
name: Build and release lambda-loader
1111
runs-on: ubuntu-latest
1212

1313
permissions:
@@ -32,9 +32,9 @@ jobs:
3232
file: gradle.properties
3333
all: true
3434

35-
- name: Publish stable release to Maven
35+
- name: Publish snapshot to maven
3636
id: upload-maven
37-
run: ./gradlew publish -PmavenType=stable -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}
37+
run: ./gradlew publish -PmavenType=release -PmavenUsername=${{ secrets.MAVEN_USER }} -PmavenPassword=${{ secrets.MAVEN_TOKEN }}
3838

3939
- name: Create release
4040
uses: softprops/action-gh-release@v2.0.8
@@ -44,4 +44,4 @@ jobs:
4444
generate_release_notes: true
4545
append_body: true
4646
make_latest: "true"
47-
files: build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}.jar
47+
files: build/libs/${{ steps.all.outputs.modId }}-${{ steps.all.outputs.modVersion }}.jar

build.gradle.kts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,30 +58,28 @@ java {
5858
targetCompatibility = JavaVersion.VERSION_21
5959
}
6060

61+
// configure the maven publication
6162
publishing {
62-
val mavenType = project.findProperty("mavenType").toString()
63-
val mavenUrl = "https://maven.lambda-client.org/${mavenType}"
64-
val versionBase = "$modVersion+$minecraftVersion"
65-
66-
val finalVersion =
67-
if (mavenType == "dev") {
68-
val buildNumber = project.findProperty("buildNumber").toString()
69-
"$versionBase-dev.$buildNumber"
70-
} else versionBase
63+
val publishType = project.findProperty("mavenType").toString()
64+
val isSnapshots = publishType == "snapshots"
65+
val mavenUrl = if (isSnapshots) "https://maven.lambda-client.org/snapshots" else "https://maven.lambda-client.org/releases"
66+
val mavenVersion =
67+
if (isSnapshots) "$modVersion+$minecraftVersion-SNAPSHOT"
68+
else "$modVersion+$minecraftVersion"
7169

7270
publications {
7371
create<MavenPublication>("maven") {
7472
groupId = mavenGroup
7573
artifactId = modId
76-
version = finalVersion
74+
version = mavenVersion
7775

7876
from(components["java"])
7977
}
8078
}
8179

8280
repositories {
8381
maven(mavenUrl) {
84-
name = "lambda-maven"
82+
name = "lambda-reposilite"
8583

8684
credentials {
8785
username = project.findProperty("mavenUsername").toString()
@@ -93,4 +91,4 @@ publishing {
9391
}
9492
}
9593
}
96-
}
94+
}

0 commit comments

Comments
 (0)