Skip to content

Commit

Permalink
Merge pull request #669 from P3pp3rF1y/1.20.4-dev
Browse files Browse the repository at this point in the history
Build fixes
  • Loading branch information
P3pp3rF1y authored Apr 2, 2024
2 parents 94e02d7 + 29b0557 commit 6369cb1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Publish to Github Packages
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew build publish
run: ./gradlew build publish --info
- name: Cleanup old artifacts
uses: actions/delete-package-versions@v3
with:
Expand Down Expand Up @@ -74,4 +74,4 @@ jobs:
embed-description: "${{steps.embed.outputs.EMBED_DESCRIPTION}}"
embed-author-name: "${{steps.embed.outputs.EMBED_AUTHOR_NAME}}"
embed-author-icon-url: "${{steps.embed.outputs.EMBED_AUTHOR_ICON_URL}}"
embed-color: 58633
embed-color: 58633
19 changes: 3 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'idea'
id 'maven-publish'
id 'net.neoforged.gradle.userdev' version '7.0.101'
id "org.sonarqube" version "3.3"
id "org.sonarqube" version "5.0.0.4638"
}

idea {
Expand Down Expand Up @@ -109,19 +109,6 @@ tasks.withType(ProcessResources).configureEach {
}
}

publishing {
publications {
register('mavenJava', MavenPublication) {
from components.java
}
}
repositories {
maven {
url "file://${project.projectDir}/repo"
}
}
}

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
Expand All @@ -147,7 +134,7 @@ static def getBuildNumber() {

static def getStable() {
if ((System.getenv("GITHUB_REF") == null || System.getenv("GITHUB_REF").endsWith("-dev"))) {
return "-SNAPSHOT"
return "-dev"
}
return ""
}
Expand Down Expand Up @@ -180,4 +167,4 @@ sonarqube {

task printVersionName {
println "version:" + project.version
}
}

0 comments on commit 6369cb1

Please sign in to comment.