From 7f983f05c8f0627d214d3b95144889773b13e78d Mon Sep 17 00:00:00 2001
From: evanchooly <jlee@antwerkz.com>
Date: Wed, 23 Aug 2023 16:57:01 -0400
Subject: [PATCH] update workflows

---
 .github/workflows/build.yml   | 23 ++++++++++-------------
 .github/workflows/release.yml | 16 ----------------
 2 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ffb6783bff..457d1a16b96 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
-    tags-ignore:
+    tags:
       - r[0-9]*
   workflow_dispatch:
 
@@ -16,7 +16,6 @@ jobs:
     with:
       java: 20
       saveBuild: true
-      maven-flags: "-Dmongodb=6"
 
   Test:
     needs:
@@ -62,36 +61,34 @@ jobs:
             optional: true
 
     uses: evanchooly/workflows/.github/workflows/build.yml@master
-    secrets:
-      GH_TOKEN: ${{ secrets.TESTING_GH_OAUTH }}
     with:
       java: ${{ matrix.java }}
       reuseBuild: true
       archive-name: "${{matrix.mongo}}-${{matrix.driver}}-${{matrix.java}}-${{github.run_id}}"
       maven-flags: "-e -Dmongodb=${{ matrix.mongo }} -Ddriver.version=${{ matrix.driver }}"
 
-  Snapshots:
-    if: github.ref_type == 'branch'
+  Release:
+    if: github.ref_type == 'branch' || github.ref_type == 'tag'
     needs:
       - Test
     uses: evanchooly/workflows/.github/workflows/release.yml@master
     secrets:
-      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-      MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-      GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-      GH_TOKEN: ${{ secrets.GH_OAUTH }}
+      GH_PUSH_TOKEN       : ${{ secrets.GH_PUSH_TOKEN }}
+      GPG_PASSPHRASE      : ${{ secrets.GPG_PASSPHRASE }}
+      GPG_PRIVATE_KEY     : ${{ secrets.GPG_PRIVATE_KEY }}
+      SONATYPE_USERNAME   : ${{ secrets.SONATYPE_USERNAME }}
+      SONATYPE_PASSWORD   : ${{ secrets.SONATYPE_PASSWORD }}
 
   Docs:
     name: Update Documentation
     runs-on: ubuntu-latest
     needs:
-      - Snapshots
+      - Release
     steps:
       - name: Invoke antora build
         uses: benc-uk/workflow-dispatch@v121
         with:
           workflow: Docs
           repo: MorphiaOrg/morphia-docs
-          token: ${{ secrets.PUSH_TOKEN }}
+          token: ${{ secrets.GH_PUSH_TOKEN }}
           ref: refs/heads/master
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 0bb0737743b..00000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - r[0-9]*
-
-jobs:
-  release:
-    uses: evanchooly/workflows/.github/workflows/release.yml@master
-    secrets:
-      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-      MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-      GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-      GH_TOKEN: ${{ secrets.GH_OAUTH }}