From 31efd348e4503fbce5941a19e2b5055cae73783f Mon Sep 17 00:00:00 2001
From: gregnuj <greg@terra.money>
Date: Fri, 26 Jan 2024 13:02:35 -0600
Subject: [PATCH] inlude kava rocksdb build with non rocks build

---
 .github/workflows/docker-build.yml       |  2 +-
 .github/workflows/kava-build.yml         |  8 ++-
 .github/workflows/kava-rocksdb-build.yml | 66 ------------------------
 3 files changed, 8 insertions(+), 68 deletions(-)
 delete mode 100644 .github/workflows/kava-rocksdb-build.yml

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b914293..4bdd4db 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -106,7 +106,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # https://docs.docker.com/build/ci/github-actions/multi-platform/
       - name: Set up QEMU
diff --git a/.github/workflows/kava-build.yml b/.github/workflows/kava-build.yml
index 3c83a43..82f36bf 100644
--- a/.github/workflows/kava-build.yml
+++ b/.github/workflows/kava-build.yml
@@ -28,6 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        version_suffix: ["", "-rdb"]
         #platform: ["linux/amd64", "linux/arm64"] # need arm runners
         platform: ["linux/amd64"]
         distro: ["alpine"]
@@ -57,6 +58,10 @@ jobs:
             os: "linux"
             arch: "amd64"
 
+          - version_suffix: "-rdb"
+            rocksdb_version: "8.1.1"
+            cosmos_build_options: "nostrip rocksdb"
+
           - version: "0.15.0"
             go_version: "1.13"
             build_command: "make install && mv /go/bin/kvd /go/bin/kava"
@@ -105,4 +110,5 @@ jobs:
       distro: ${{ matrix.distro }}
       platform: ${{ matrix.platform }}
       repo: ${{ matrix.repo }}
-      version: ${{ matrix.version }}
+      version: ${{ format('{0}{1}', matrix.version, matrix.version_suffix }}
+      repo_tag: ${{ matrix.version }}
diff --git a/.github/workflows/kava-rocksdb-build.yml b/.github/workflows/kava-rocksdb-build.yml
deleted file mode 100644
index 422a4eb..0000000
--- a/.github/workflows/kava-rocksdb-build.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-name: kava-rocksdb-build
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'bin/builder'
-      - 'arch.Dockerfile'
-      - 'alpine.Dockerfile'
-      - '.github/workflows/docker-build.yml'
-      - '.github/workflows/kava-rocksdb-build.yml'
-
-  push:
-    branches:
-      - main
-    paths:
-      - 'bin/builder'
-      - 'arch.Dockerfile'
-      - 'alpine.Dockerfile'
-      - '.github/workflows/docker-build.yml'
-      - '.github/workflows/kava-rocksdb-build.yml'
-
-jobs:
-  kava-rocksdb-build:
-    uses: ./.github/workflows/docker-build.yml
-    secrets: inherit
-    strategy:
-      fail-fast: false
-      matrix:
-        #platform: ["linux/amd64", "linux/arm64"] # need arm runners
-        platform: ["linux/amd64"]
-        distro: ["alpine"]
-        version:
-          - "0.25.0"
-
-        include:
-          # Include Defaults (keep at top)
-          - name: "kava-rocksdb"
-            binary: "kava"
-            build_command: "make install"
-            chain_registry_name: "kava"
-            repo: "Kava-Labs/kava"
-            go_version: "1.20"
-            os: "linux"
-            arch: "amd64"
-            rocksdb_version: "8.1.1"
-            cosmos_build_options: "nostrip rocksdb"
-
-          - version: "0.25.0"
-            go_version: "1.19"
-
-    with:
-      binary: ${{ matrix.binary }}
-      build_command: ${{ matrix.build_command }}
-      chain_registry_name: ${{ matrix.chain_registry_name }}
-      go_version: ${{ matrix.go_version }}
-      name: ${{ matrix.name }}
-      os: ${{ matrix.os }}
-      arch: ${{ matrix.arch }}
-      distro: ${{ matrix.distro }}
-      platform: ${{ matrix.platform }}
-      repo: ${{ matrix.repo }}
-      version: ${{ matrix.version }}
-      rocksdb_version: v${{ matrix.rocksdb_version }}
-      denom: ukava