From 0b0a4e8dff6df5e44c38d887a923670f08c72785 Mon Sep 17 00:00:00 2001
From: Andrea Peruffo <andrea.peruffo1982@gmail.com>
Date: Sat, 20 Jan 2024 12:13:23 +0000
Subject: [PATCH] cleanup

---
 .github/workflows/release.yaml | 75 ++++++++++++++++------------------
 pom.xml                        |  2 -
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7f8b9e201..4edb6b13a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,17 +1,15 @@
 name: release
 
 on:
-  push:
-  # TODO: revert these changes, just need to publish!
-  # workflow_dispatch:
-  #   inputs:
-  #     release-version:
-  #       description: 'Version being released'
-  #       required: true
-  #     branch:
-  #       description: 'Branch to release from'
-  #       required: true
-  #       default: 'main'
+  workflow_dispatch:
+    inputs:
+      release-version:
+        description: 'Version being released'
+        required: true
+      branch:
+        description: 'Branch to release from'
+        required: true
+        default: 'main'
 
 permissions:
   contents: write
@@ -45,23 +43,22 @@ jobs:
       - name: Compile
         run: mvn clean install -DskipTests=true
 
-      # - name: Setup Git
-      #   run: |
-      #     git config user.name "Chicory BOT"
-      #     git config user.email "chicory@dylibso.com"
+      - name: Setup Git
+        run: |
+          git config user.name "Chicory BOT"
+          git config user.email "chicory@dylibso.com"
 
-      # - name: Set the version
-      #   run: |
-      #     mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.release-version }}
-      #     git add .
-      #     git commit -m "Release version update ${{ github.event.inputs.release-version }}"
-      #     git push
-      #     git tag ${{ github.event.inputs.release-version }}
-      #     git push origin ${{ github.event.inputs.release-version }}
-      #   env:
-      #     GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
+      - name: Set the version
+        run: |
+          mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.release-version }}
+          git add .
+          git commit -m "Release version update ${{ github.event.inputs.release-version }}"
+          git push
+          git tag ${{ github.event.inputs.release-version }}
+          git push origin ${{ github.event.inputs.release-version }}
+        env:
+          GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
 
-      # Now should work!
       - name: Release to Maven Central
         run: mvn --batch-mode clean deploy -Prelease -DskipTests=true -X
         env:
@@ -69,17 +66,17 @@ jobs:
           MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
-      # - name: Release
-      #   uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
-      #   with:
-      #     tag_name: ${{ github.event.inputs.release-version }}
-      #     token: ${{secrets.GH_TOKEN}}
+      - name: Release
+        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
+        with:
+          tag_name: ${{ github.event.inputs.release-version }}
+          token: ${{secrets.GH_TOKEN}}
 
-      # - name: Back to Snapshot
-      #   run: |
-      #     mvn versions:set -DgenerateBackupPoms=false -DnewVersion=999-SNAPSHOT
-      #     git add .
-      #     git commit -m "Snapshot version update"
-      #     git push
-      #   env:
-      #     GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
+      - name: Back to Snapshot
+        run: |
+          mvn versions:set -DgenerateBackupPoms=false -DnewVersion=999-SNAPSHOT
+          git add .
+          git commit -m "Snapshot version update"
+          git push
+        env:
+          GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
diff --git a/pom.xml b/pom.xml
index e4d5a45b4..0cc841606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,8 +336,6 @@
               <serverId>ossrh</serverId>
               <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
               <autoReleaseAfterClose>true</autoReleaseAfterClose>
-              <!-- DEBUG -->
-              <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
             </configuration>
           </plugin>
         </plugins>