Further testing tags

.github/workflows/branches.yml

@@ -23,8 +23,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
       - name: Build with Gradle
         run: ./gradlew build
-      - name: Publish Snapshot
+      - uses: actions/upload-artifact@v2
-        run: ./gradlew publish
+        with:
-        env:
+          name: dist
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          path: build/libs/
-        if: github.ref == 'refs/heads/fabric/master'

.github/workflows/release.yml

@@ -10,12 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Validate semver
+      - name: Export current tag as environment variable
         env:
           TAG: ${{ github.event.ref }}
-        run: |
+        run: echo "::set-env name=TAG::${TAG}"
-          echo $TAG | grep -oP '^fabric/v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'
-          echo "::set-env name=RELEASE::${TAG:1}"
       - uses: actions/checkout@v2
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
@@ -29,12 +27,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew generateData build
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: dist
+          path: build/libs/
       - name: Publish to github packages
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew publish
+        run: echo "./gradlew publish"
       - name: Upload to curseforge
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CURSEFORGE: ${{ secrets.CURSEFORGE }}
-        run: ./gradlew curseforge
+        run: echo "./gradlew curseforge"

build.gradle

@@ -60,6 +60,29 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
+// Create version number
+ext.pr = System.getenv('PR_NUMBER') ?: ""
+if (ext.pr) {
+  version = version + "+pr." + ext.pr
+}
+
+ext.branch = System.getenv('BRANCH') ?: ""
+if (ext.branch) {
+  version = version + "+branch." + ext.branch
+}
+
+ext.tag = System.getenv('TAG') ?: ""
+if (ext.tag && ext.tag.startsWith("fabric/v")) {
+  version = ext.tag.substring("fabric/v".length())
+  // Validate that the rest is a semver version
+  if (version ==~ /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/) {
+    println("::set-env name=VERSION::${version}")
+  } else {
+    throw new GradleException("Invalid semver: $version")
+  }
+}
+
+// Maven group and artifact name
 group = artifact_group
 archivesBaseName = artifact_basename
 
@@ -151,17 +174,19 @@ processResources {
 apply from: 'gradle/scripts/artifacts.gradle'
 apply from: 'gradle/scripts/curseforge.gradle'
 
-publishing {
+if (!version.endsWith("-SNAPSHOT")) {
-    publications {
+    publishing {
-        mavenJava(MavenPublication) {
+        publications {
-            artifactId = 'appliedenergistics2-fabric'
+            mavenJava(MavenPublication) {
+                artifactId = 'appliedenergistics2-fabric'
 
-            // add all the jars that should be included when publishing to maven
+                // add all the jars that should be included when publishing to maven
-            artifact(remapJar) {
+                artifact(remapJar) {
-                builtBy remapJar
+                    builtBy remapJar
-            }
+                }
-            artifact(sourcesJar) {
+                artifact(sourcesJar) {
-                builtBy remapSourcesJar
+                    builtBy remapSourcesJar
+                }
             }
         }
     }

gradle/scripts/curseforge.gradle

@@ -26,7 +26,7 @@ if (isAlpha) {
   cfReleaseType = "beta"
 }
 
-if (System.getenv("CURSEFORGE")) {
+if (System.getenv("CURSEFORGE") && !version.endsWith("-SNAPSHOT")) {
   curseforge {
     apiKey = System.getenv("CURSEFORGE")
     project {