From 50c398a6861261944192056b9c6770d5b7b70ba7 Mon Sep 17 00:00:00 2001
From: Nitesh Sandal <nitesh.sandal@merge.dev>
Date: Thu, 12 Jun 2025 19:09:40 -0400
Subject: [PATCH 1/2] update ruby client ci to complile + test on push

---
 .github/workflows/ci.yml      | 63 +++++++++++++++++++++++++++++++++++
 .github/workflows/publish.yml | 26 ---------------
 2 files changed, 63 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..e25a3c20
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,63 @@
+name: ci
+
+on: [push]
+
+jobs:
+  compile:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2' # Set to your Ruby version
+
+      - name: Install dependencies
+        run: bundle install --jobs 4 --retry 3
+
+      - name: Build gem
+        run: bundle exec rake build
+
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2' # Set to your Ruby version
+
+      - name: Install dependencies
+        run: bundle install --jobs 4 --retry 3
+
+      - name: Run tests
+        run: bundle exec rake test # or 'bundle exec rspec' if using RSpec
+
+  publish:
+    needs: [ compile, test ]
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: Test gem
+        run: bundle install && bundle exec rake test
+
+      - name: Build and Push Gem
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBY_GEMS_API_KEY }}
+        run: |
+          gem build merge_ruby_client.gemspec
+          gem push merge_ruby_client-*.gem --host https://rubygems.org/
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 3bc67456..00000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Publish
-
-on: [push]
-jobs:
-    publish:
-        if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-        runs-on: ubuntu-latest
-        steps:
-          - name: Checkout repo
-            uses: actions/checkout@v3
-
-          - uses: ruby/setup-ruby@v1
-            with:
-              ruby-version: 2.7
-              bundler-cache: true
-
-          - name: Test gem
-            run: bundle install && bundle exec rake test
-              
-          - name: Build and Push Gem
-            env:
-              GEM_HOST_API_KEY: ${{ secrets.RUBY_GEMS_API_KEY }}
-            run: |
-              gem build merge_ruby_client.gemspec
-
-              gem push merge_ruby_client-*.gem --host https://rubygems.org/

From 2f1628e8dd687339437d9537d5dd9b7c2aaa8e32 Mon Sep 17 00:00:00 2001
From: Nitesh Sandal <nitesh.sandal@merge.dev>
Date: Thu, 12 Jun 2025 19:19:03 -0400
Subject: [PATCH 2/2] update yml

---
 .github/workflows/ci.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e25a3c20..cb0967b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,13 +13,10 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2' # Set to your Ruby version
-
-      - name: Install dependencies
-        run: bundle install --jobs 4 --retry 3
+          ruby-version: '2.7'
 
       - name: Build gem
-        run: bundle exec rake build
+        run: gem build merge_ruby_client.gemspec
 
   test:
     runs-on: ubuntu-latest
@@ -31,13 +28,10 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2' # Set to your Ruby version
-
-      - name: Install dependencies
-        run: bundle install --jobs 4 --retry 3
+          ruby-version: '2.7'
 
       - name: Run tests
-        run: bundle exec rake test # or 'bundle exec rspec' if using RSpec
+        run: bundle install && bundle exec rake test
 
   publish:
     needs: [ compile, test ]