From adb01a90c016497e55d3a3bb9e1e0e980137da12 Mon Sep 17 00:00:00 2001
From: Victor Garcia <victor.garcia@dhis2.org>
Date: Wed, 14 Feb 2024 12:27:20 +0100
Subject: [PATCH] fix: separate Nyx config file

---
 .github/workflows/job-publish.yml |  6 ++--
 .nyx.yaml                         | 57 +++++++++++++++++++++++++++++++
 settings.gradle.kts               |  4 ---
 3 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 .nyx.yaml

diff --git a/.github/workflows/job-publish.yml b/.github/workflows/job-publish.yml
index a60f7c1..20b6331 100644
--- a/.github/workflows/job-publish.yml
+++ b/.github/workflows/job-publish.yml
@@ -22,8 +22,10 @@ jobs:
         with:
           node-version: 14.x
 
-      - name: Create version tag
-        run: ./gradlew :nyxMark
+      - name: Create tag and publish Github release
+        run: ./gradlew :nyxPublish
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish Maven
         run: ./.github/workflows/scripts/publish-maven.sh
diff --git a/.nyx.yaml b/.nyx.yaml
new file mode 100644
index 0000000..f98391d
--- /dev/null
+++ b/.nyx.yaml
@@ -0,0 +1,57 @@
+---
+# starting from the "simple" preset gives us:
+# - the Conventional Commits convention
+preset: "simple"
+changelog:
+  path: "CHANGELOG.md"
+  sections:
+    "Added": "^feat$"
+    "Fixed": "^fix$"
+releaseTypes:
+  enabled:
+    - mainline
+    - maturity
+    - internal
+  publicationServices:
+    - github
+  items:
+    mainline:
+      description: "{{#fileContent}}CHANGELOG.md{{/fileContent}}"
+      filterTags: "^({{configuration.releasePrefix}})?([0-9]\\d*)\\.([0-9]\\d*)\\.([0-9]\\d*)$"
+      gitPush: "true"
+      gitTag: "true"
+      matchBranches: "^(master|main)$"
+      matchEnvironmentVariables:
+        CI: "^true$"
+      matchWorkspaceStatus: "CLEAN"
+      publish: "true"
+    maturity:
+      description: "{{#fileContent}}CHANGELOG.md{{/fileContent}}"
+      collapseVersions: true
+      collapsedVersionQualifier: "{{#sanitizeLower}}{{branch}}{{/sanitizeLower}}"
+      filterTags: "^({{configuration.releasePrefix}})?([0-9]\\d*)\\.([0-9]\\d*)\\.([0-9]\\d*)(-(alpha|beta)(\\.([0-9]\\d*))?)?$"
+      gitPush: "true"
+      gitTag: "true"
+      matchBranches: "^(alpha|beta)$"
+      matchEnvironmentVariables:
+        CI: "^true$"
+      matchWorkspaceStatus: "CLEAN"
+      publish: "true"
+      publishPreRelease: "true"
+    internal:
+      collapseVersions: true
+      collapsedVersionQualifier: "internal"
+      gitPush: "false"
+      gitTag: "false"
+      identifiers:
+        -
+          qualifier: "{{#timestampYYYYMMDDHHMMSS}}{{timestamp}}{{/timestampYYYYMMDDHHMMSS}}"
+          position: "BUILD"
+      publish: "false"
+services:
+  github:
+    type: "GITHUB"
+    options:
+      AUTHENTICATION_TOKEN: "{{#environmentVariable}}GH_TOKEN{{/environmentVariable}}"
+      REPOSITORY_NAME: "expression-parser"
+      REPOSITORY_OWNER: "dhis2"
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5c27c43..31a0554 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,8 +10,4 @@ plugins {
     id("com.mooltiverse.oss.nyx") version "2.5.2"
 }
 
-configure<com.mooltiverse.oss.nyx.gradle.NyxExtension> {
-    preset.set("extended")
-}
-
 rootProject.name = "expression-parser"