From 2b441c04ca47ef8e99aeb4784002d36b27f5f6e7 Mon Sep 17 00:00:00 2001
From: Shannon Klaus <sklaus@aerospike.com>
Date: Wed, 13 Nov 2024 10:10:05 -0700
Subject: [PATCH] Combine build, setup server, and test into one job to
 simplify for now

---
 .github/workflows/tests.yml | 55 ++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 50d869a6..1ef603e6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -24,13 +24,43 @@ on:
         required: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
+  #build:
+  #  runs-on: ubuntu-latest
+  #  strategy:
+  #    fail-fast: false
+  #
+  #  steps:
+  #  - uses: actions/checkout@v4
+  #  - name: Setup .NET
+  #    uses: actions/setup-dotnet@v4
+  #    with:
+  #      dotnet-version: 6.0.x
+  #  - name: Restore dependencies
+  #    run: dotnet restore /p:EnableWindowsTargeting=true
+  #  #- name: Install dependencies
+  #  #  run: dotnet add package NeoLua --version 1.3.14
+  #  - name: Build
+  #    run: dotnet build --configuration Release --no-restore /p:EnableWindowsTargeting=true
+  #   
+  #  - name: Publish
+  #    run: dotnet publish -c Release -o ../publish
+  #    
+  #  - name: Send files to test jobs
+  #    uses: actions/upload-artifact@v3
+  #    with:
+  #      name: AerospikeClient.dll
+  #      path: ./AerospikeClient/bin/Debug/*.whl
 
+  test-ee:
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
+
+    - uses: ./.github/actions/run-ee-server
+      with:
+        use-server-rc: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
+        docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
+        docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }}
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
@@ -40,17 +70,10 @@ jobs:
     #- name: Install dependencies
     #  run: dotnet add package NeoLua --version 1.3.14
     - name: Build
-      run: dotnet build --no-restore /p:EnableWindowsTargeting=true
-
-  test-ee:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - uses: ./.github/actions/run-ee-server
-      with:
-        use-server-rc: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
-        docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
-        docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }}
+      run: dotnet build --configuration Release --no-restore /p:EnableWindowsTargeting=true
+     
+    - name: Publish
+      run: dotnet publish -c Release -o ../publish
 
     - name: Run tests
       run: dotnet test --no-build --verbosity normal