Merge pull request #20 from LabyMod/develop

Merge develop into master (and publish to OSSHR releases)

Author: Janrupf

.github/workflows/ci.yml

@@ -96,12 +96,14 @@ jobs:
         run: "./gradlew -PCI=true -PnativeBinaryExternalDir=native-binaries ultralight-java-lwjgl3-opengl:build"
       - name: Check license
         run: "./gradlew licenseCheck"
-      # - name: Deploy to maven central
-      #   if: github.ref == 'refs/heads/master'
-      #   run: "./gradlew -PCI=true -PenableSigning -PnativeBinaryExternalDir=native-binaries :publish"
-      #   env:
-      #     SIGNING_KEY: ${{ secrets.signingKey }}
-      #     SIGNING_PASSWORD: ${{ secrets.signingPassword }}
+      - name: Deploy to OSSHR
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
+        run: "./gradlew -PCI=true -PenableSigning -PnativeBinaryExternalDir=native-binaries publish"
+        env:
+          SIGNING_KEY: ${{ secrets.signingKey }}
+          SIGNING_PASSWORD: ${{ secrets.signingPassword }}
+          OSSHR_USER: ${{ secrets.osshrUser }}
+          OSSHR_PASSWORD: ${{ secrets.osshrPassword }}
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:

VERSION

@@ -0,0 +1 @@
+0.3.0

build.gradle

@@ -5,16 +5,37 @@ plugins {
 }
 
 group 'com.labymedia'
-version '0.3.0'
+apply from: 'version.gradle'
 
 apply from: 'ci.gradle'
 
-def getSigningProperty(String name) {
+static String getSigningProperty(String name) {
     return System.getenv("SIGNING_${name}")
 }
 
+String getAuthenticationProperty(String propName, String envName) {
+    return project.hasProperty(propName) ? project.properties.get(propName) : System.getenv(envName)
+}
+
 ext.commonPublish = { Project currentProject, Closure config ->
     currentProject.publishing {
+        repositories {
+            def releaseRepo = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
+
+            if(!version.endsWith("-UNSTABLE")) {
+                maven {
+                    url version.endsWith("-SNAPSHOT") ? snapshotRepo : releaseRepo
+                    name "OSS${version.endsWith("-SNAPSHOT") ? "Snapshots" : "Release"}HostingRepository"
+
+                    credentials {
+                        username getAuthenticationProperty("osshrUser", "OSSHR_USER")
+                        password getAuthenticationProperty("osshrPassword", "OSSHR_PASSWORD")
+                    }
+                }
+            }
+        }
+
         publications {
             mavenJava(MavenPublication) {
                 from currentProject.components.java

version.gradle

@@ -0,0 +1,77 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
+def versionFromFile = file("VERSION").text.trim()
+
+static String getGithubVar(String name) {
+    return System.getenv("GITHUB_${name}")
+}
+
+static boolean isWindows() {
+    return Os.isFamily(Os.FAMILY_WINDOWS)
+}
+
+File getGitExecutable() {
+    String gitExe = isWindows() ? "git.exe" : "git"
+    return System.getenv("PATH")?.split(File.pathSeparator)?.collect {file("${it}/${gitExe}") }?.find {it.canExecute() }
+}
+
+String getBranchName() {
+    File gitExe = getGitExecutable()
+
+    if (gitExe == null) {
+        logger.warn("Git not found on path")
+        return "unknown"
+    }
+
+    return new ByteArrayOutputStream().withStream { out ->
+        String githubActionsRef = getGithubVar("REF")
+        if (githubActionsRef != null) {
+            return githubActionsRef.trim().substring(11).replace('/', '_')
+        }
+
+        exec {
+            executable gitExe
+            workingDir rootDir
+            args "rev-parse", "--abbrev-ref", "HEAD"
+            standardOutput out
+        }
+
+        return out.toString("UTF-8").trim()
+    }
+}
+
+String getCommit() {
+    File gitExe = getGitExecutable()
+
+    if (gitExe == null) {
+        logger.warn("Git not found on path")
+        return "unknown"
+    }
+
+    return new ByteArrayOutputStream().withStream { out ->
+        exec {
+            executable gitExe
+            workingDir rootDir
+            args "rev-parse", "--short", "HEAD"
+            standardOutput out
+        }
+
+        return out.toString("UTF-8").trim()
+    }
+}
+
+
+String branchName = getBranchName()
+switch(branchName) {
+    case "master":
+        version = versionFromFile
+        break
+
+    case "develop":
+        version = "${versionFromFile}-SNAPSHOT"
+        break
+
+    default:
+        version = "${versionFromFile}-${getCommit()}-UNSTABLE"
+        break
+}