Merge pull request #77 from modelix/feature/fix-ghp-build

Improve maven publishing config and fix GitHub workflow

Author: nkoester

.github/workflows/publish.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Use tag as version
         run: echo "${GITHUB_REF#refs/*/}" > version.txt
       - name: Build and Publish Artifacts
-        run: ./gradlew build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -PGITHUB_ACTOR=${{ github.actor }} -PGITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -Pgpr.user=${{ github.actor }} -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.ARTIFACTS_ITEMIS_CLOUD_NPM_TOKEN }}
       - name: Set up QEMU

build.gradle.kts

@@ -44,42 +44,37 @@ subprojects {
 
     publishing {
         repositories {
-            if (project.hasProperty("artifacts.itemis.cloud.user")) {
-                maven {
-                    name = "itemis"
-                    url = if (version.toString().contains("SNAPSHOT"))
-                        uri("https://artifacts.itemis.cloud/repository/maven-mps-snapshots/")
-                    else
-                        uri("https://artifacts.itemis.cloud/repository/maven-mps-releases/")
-                    credentials {
-                        username = project.findProperty("artifacts.itemis.cloud.user").toString()
-                        password = project.findProperty("artifacts.itemis.cloud.pw").toString()
-                    }
+            maven {
+                name = "itemis"
+                url = if (version.toString().contains("SNAPSHOT")) {
+                    uri("https://artifacts.itemis.cloud/repository/maven-mps-snapshots/")
+                } else {
+                    uri("https://artifacts.itemis.cloud/repository/maven-mps-releases/")
+                }
+                credentials {
+                    username = project.findProperty("artifacts.itemis.cloud.user").toString()
+                    password = project.findProperty("artifacts.itemis.cloud.pw").toString()
                 }
             }
-            val ghp_username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-            val ghp_password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
-            if (ghp_username != null && ghp_password != null) {
-                maven {
-                    name = "GitHubPackages"
-                    // we moved some components from modelix/modelix to modelix/modelix.core but github packages
-                    // cannot handle this situation. basically we suffer from what is described here:
-                    //     https://github.com/orgs/community/discussions/23474
-                    // this is a simple workaround for the affected components.
-                    // consequently, when obtaining these dependencies, the repo url is the old modelix/modelix one...
-                    if (project.name in arrayOf("model-client",
-                                    "model-client-js",
-                                    "model-client-jvm",
-                                    "model-server",
-                                    "model-server-api")) {
-                        url = uri("https://maven.pkg.github.com/modelix/modelix")
-                    } else {
-                        url = uri("https://maven.pkg.github.com/modelix/modelix.core")
-                    }
-                    credentials {
-                        username = ghp_username
-                        password = ghp_password
-                    }
+            maven {
+                name = "GitHubPackages"
+                // we moved some components from modelix/modelix to modelix/modelix.core but github packages
+                // cannot handle this situation. basically we suffer from what is described here:
+                //     https://github.com/orgs/community/discussions/23474
+                // this is a simple workaround for the affected components.
+                // consequently, when obtaining these dependencies, the repo url is the old modelix/modelix one...
+                if (project.name in arrayOf("model-client",
+                                "model-client-js",
+                                "model-client-jvm",
+                                "model-server",
+                                "model-server-api")) {
+                    url = uri("https://maven.pkg.github.com/modelix/modelix")
+                } else {
+                    url = uri("https://maven.pkg.github.com/modelix/modelix.core")
+                }
+                credentials {
+                    username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+                    password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
                 }
             }
         }