Skip to content

Commit 578753d

Browse files
committed
Add Ore publishing
Affects issues: - #2906
1 parent 42ee597 commit 578753d

2 files changed

Lines changed: 39 additions & 36 deletions

File tree

.github/workflows/on-release.yml

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,38 +64,30 @@ jobs:
6464
name: Ore Upload
6565
runs-on: ubuntu-latest
6666
steps:
67+
- name: Checkout 🛎️
68+
uses: actions/checkout@v4
69+
with:
70+
fetch-depth: 0
6771
- name: Download release artifact for upload
6872
run: |
6973
curl 'https://api.github.com/repos/plan-player-analytics/plan/releases/${{ github.event.release.id }}/assets' | jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric") | not)' > asset.txt
7074
jq -r '.url' asset.txt > url.txt
7175
jq -r '.name' asset.txt > name.txt
7276
wget -i url.txt
73-
echo "JAR_FILENAME=$(cat name.txt)" >> $GITHUB_ENV
74-
- name: Upload artifact for ore upload
75-
uses: actions/upload-artifact@v3
76-
with:
77-
name: ${{ github.event.release.name }}
78-
path: ${{ env.JAR_FILENAME }}
79-
- name: Upload release to Ore 🚀
80-
if: ${{ github.event.release.prerelease == false }}
81-
uses: dualspiral/ore-upload-action@v2
82-
with:
83-
plugin: ${{ github.event.release.name }}
84-
description: ${{ github.event.release.body }}
85-
apiKey: ${{ secrets.ORE_API_TOKEN }}
86-
channel: Release
87-
pluginId: plan
88-
createForumPost: true
89-
- name: Upload DEV release to Ore 🚀
90-
if: ${{ github.event.release.prerelease == true }}
91-
uses: dualspiral/ore-upload-action@v1
77+
echo "RELEASE_JAR_PATH=$(pwd)/$(cat name.txt)" >> $GITHUB_ENV
78+
- name: Setup JDK
79+
uses: actions/setup-java@v4
9280
with:
93-
plugin: ${{ github.event.release.name }}
94-
description: ${{ github.event.release.body }}
95-
apiKey: ${{ secrets.ORE_API_TOKEN }}
96-
channel: DEV
97-
pluginId: plan
98-
createForumPost: false
81+
distribution: 'temurin'
82+
java-version: '25'
83+
- name: Publish release to Ore 🚀
84+
env:
85+
ORE_TOKEN: ${{ secrets.ORE_API_TOKEN }}
86+
RELEASE_CHANGELOG: ${{ github.event.release.body }}
87+
RELEASE_PRERELEASE: ${{ github.event.release.prerelease }}
88+
RELEASE_JAR_PATH: ${{ env.RELEASE_JAR_PATH }}
89+
run: |
90+
./gradlew :plugin:publishToOre
9991
10092
upload_release_curseforge:
10193
name: CurseForge Upload

Plan/plugin/build.gradle

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

33
plugins {
44
id "io.papermc.hangar-publish-plugin" version "0.1.4"
5+
id "org.spongepowered.gradle.ore" version "2.3.0"
56
}
67

78
apply plugin: "com.gradleup.shadow"
@@ -124,26 +125,36 @@ publishing {
124125

125126
hangarPublish {
126127
publications.register("plugin") {
127-
version = project.fullVersionSemantic
128-
id = "Plan-Player-Analytics"
129-
channel = providers.environmentVariable("RELEASE_PRERELEASE").map { it == "true" ? "Snapshot" : "Release" }.orElse("Release")
130-
changelog = providers.environmentVariable("RELEASE_CHANGELOG")
131-
apiKey = providers.environmentVariable("HANGAR_API_TOKEN")
128+
version.set(project.fullVersionSemantic)
129+
id.set("Plan-Player-Analytics")
130+
channel.set(providers.environmentVariable("RELEASE_PRERELEASE").map { it == "true" ? "Snapshot" : "Release" }.orElse("Release"))
131+
changelog.set(providers.environmentVariable("RELEASE_CHANGELOG"))
132+
apiKey.set(providers.environmentVariable("HANGAR_API_TOKEN"))
132133
def downloadUrl = providers.environmentVariable("RELEASE_DOWNLOAD_URL")
133134

134135
platforms {
135136
paper {
136-
url = downloadUrl
137-
platformVersions = ["1.13-1.21.11"]
137+
url.set(downloadUrl)
138+
platformVersions.set(["1.13-1.21.11"])
138139
}
139140
waterfall {
140-
url = downloadUrl
141-
platformVersions = ["1.13-1.21"]
141+
url.set(downloadUrl)
142+
platformVersions.set(["1.13-1.21"])
142143
}
143144
velocity {
144-
url = downloadUrl
145-
platformVersions = ["3.5"]
145+
url.set(downloadUrl)
146+
platformVersions.set(["3.5"])
146147
}
147148
}
148149
}
150+
}
151+
152+
oreDeployment {
153+
defaultPublication {
154+
projectId.set('Plan')
155+
channel.set(providers.environmentVariable("RELEASE_PRERELEASE").map { it == "true" ? "DEV" : "Release" }.orElse("Release"))
156+
versionBody.set(providers.environmentVariable("RELEASE_CHANGELOG"))
157+
158+
publishArtifacts.from(file(providers.environmentVariable("RELEASE_JAR_PATH").getOrElse("Plan.jar")))
159+
}
149160
}

0 commit comments

Comments
 (0)