Fixup workflows

.github/workflows/base.yml

@@ -15,24 +15,21 @@ on:
         required: false
         type: string
         default: eventstore-ce/eventstoredb-ce
-      framework:
-        required: true
-        type: string
-      os:
-        required: true
-        type: string
       test:
         required: true
         type: string
-      configuration:
-        required: true
-        type: string
 
 jobs:
   test:
     timeout-minutes: 20
-    runs-on: ${{ inputs.os }}
-    name: EventStore.Client.${{ inputs.test }}/${{ inputs.os }}/${{ inputs.framework }}/${{ inputs.docker-tag }}
+    strategy:      
+      fail-fast: false
+      matrix:
+        framework: [ net6.0, net7.0, net8.0 ]
+        os: [ ubuntu-latest ]
+        configuration: [ release ]
+    runs-on: ${{ matrix.os }}
+    name: ${{ inputs.test }} (${{ matrix.os }}, ${{ matrix.framework }})
     env:
       CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
     steps:
@@ -58,18 +55,14 @@ jobs:
           6.0.x
           7.0.x
           8.0.x
-    - name: Compile
-      shell: bash
-      run: |
-        dotnet build --configuration ${{ inputs.configuration }} --framework ${{ inputs.framework }} src/EventStore.Client.${{ inputs.test }}
     - name: Run Tests
       shell: bash
       env:
         ES_DOCKER_TAG: ${{ inputs.docker-tag }}
         ES_DOCKER_REGISTRY: docker.eventstore.com/${{ inputs.docker-image }}
       run: |
         sudo ./gencert.sh
-        dotnet test --configuration ${{ inputs.configuration }} --blame \
+        dotnet test --configuration ${{ matrix.configuration }} --blame \
           --logger:"GitHubActions;report-warnings=false" --logger:"console;verbosity=normal" \
-          --framework ${{ inputs.framework }} \
+          --framework ${{ matrix.framework }} \
           test/EventStore.Client.${{ inputs.test }}.Tests

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Test CI
+name: CI
 
 on:
   pull_request:
@@ -9,7 +9,31 @@ on:
     - v*
 
 jobs:
-  test:
+  ce:
     uses: ./.github/workflows/base.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        docker-tag: [ ci, lts, previous-lts ]
+        test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
+    name: Test CE (${{ matrix.docker-tag }})
     with:
-      docker-tag: ci
+      docker-tag: ${{ matrix.docker-tag }}
+      docker-image: eventstore-ce/eventstoredb-ce
+      test: ${{ matrix.test }}
+  ee:
+    uses: ./.github/workflows/base.yml
+    if: ${{ github.repository_owner == 'EventStore' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        docker-tag: [ 24.2.0-jammy ]
+        test: [ Plugins ]
+    name: Test EE (${{ matrix.docker-tag }})
+    with:
+      docker-tag: ${{ matrix.docker-tag }}
+      docker-image: eventstore-ee/eventstoredb-commercial
+      test: ${{ matrix.test }}
+    secrets:
+      CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
+      CLOUDSMITH_CICD_TOKEN: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}

.github/workflows/dispatch-ce.yml

@@ -1,20 +1,26 @@
-name: "Dispatch CE"
+name: Dispatch CE
 
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: "Docker tag version"
+      docker-tag:
+        description: "Docker tag"
         required: true
         type: string
-      image:
+      docker-image:
         description: "Docker image"
         required: true
         type: string
 
 jobs:
   test:
-    uses: ./.github/workflows/ce.yml
+    uses: ./.github/workflows/base.yml
+    strategy:      
+      fail-fast: false
+      matrix:
+        test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
+    name: Test CE (${{ inputs.docker-tag }})
     with:
-      docker-tag: ${{ inputs.version }}
-      docker-image: ${{ inputs.image }}
+      docker-tag: ${{ inputs.docker-tag }}
+      docker-image: ${{ inputs.docker-image }}
+      test: ${{ matrix.test }}

.github/workflows/dispatch-ee.yml

@@ -1,20 +1,29 @@
-name: "Dispatch EE"
+name: Dispatch EE
 
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: "Docker tag version"
+      docker-tag:
+        description: "Docker tag"
         required: true
         type: string
-      image:
+      docker-image:
         description: "Docker image"
         required: true
         type: string
 
 jobs:
   test:
-    uses: ./.github/workflows/ee.yml
+    uses: ./.github/workflows/base.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        test: [ Plugins ]
+    name: Test EE (${{ inputs.docker-tag }})
     with:
-      docker-tag: ${{ inputs.version }}
-      docker-image: ${{ inputs.image }}
+      docker-tag: ${{ inputs.docker-tag }}
+      docker-image: ${{ inputs.docker-image }}
+      test: ${{ matrix.test }}
+    secrets:
+      CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
+      CLOUDSMITH_CICD_TOKEN: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}