Fixup workflows

EventStore · Jun 4, 2024 · 25afb28 · 25afb28
1 parent da61e84
commit 25afb28
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 25 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -32,7 +32,6 @@ jobs:
   test:
     timeout-minutes: 20
     runs-on: ${{ inputs.os }}
-    name: EventStore.Client.${{ inputs.test }}/${{ inputs.os }}/${{ inputs.framework }}/${{ inputs.docker-tag }}
     env:
       CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
     steps:
@@ -58,10 +57,6 @@ 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:

diff --git a/.github/workflows/ce.yml b/.github/workflows/ce.yml
@@ -21,13 +21,11 @@ jobs:
         os: [ ubuntu-latest ]
         test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
         configuration: [ release ]
+    name: ce / EventStore.Client.${{ matrix.test }} (${{ inputs.docker-tag }}, ${{ matrix.os }}, ${{ matrix.framework }})
     with:
       docker-tag: ${{ inputs.docker-tag }}
       docker-image: ${{ inputs.docker-image }}
       framework: ${{ matrix.framework }}
       os: ${{ matrix.os }}
       test: ${{ matrix.test }}
       configuration: ${{ matrix.configuration }}
-    secrets: 
-      CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
-      CLOUDSMITH_CICD_TOKEN: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,6 @@ on:
 
 jobs:
   test:
-    uses: ./.github/workflows/base.yml
+    uses: ./.github/workflows/ce.yml
     with:
       docker-tag: ci
diff --git a/.github/workflows/dispatch-ce.yml b/.github/workflows/dispatch-ce.yml
@@ -1,13 +1,13 @@
-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
@@ -16,5 +16,5 @@ jobs:
   test:
     uses: ./.github/workflows/ce.yml
     with:
-      docker-tag: ${{ inputs.version }}
-      docker-image: ${{ inputs.image }}
+      docker-tag: ${{ inputs.docker-tag }}
+      docker-image: ${{ inputs.docker-image }}
diff --git a/.github/workflows/dispatch-ee.yml b/.github/workflows/dispatch-ee.yml
@@ -1,13 +1,13 @@
-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
@@ -16,5 +16,5 @@ jobs:
   test:
     uses: ./.github/workflows/ee.yml
     with:
-      docker-tag: ${{ inputs.version }}
-      docker-image: ${{ inputs.image }}
+      docker-tag: ${{ inputs.docker-tag }}
+      docker-image: ${{ inputs.docker-image }}
diff --git a/.github/workflows/ee.yml b/.github/workflows/ee.yml
@@ -10,12 +10,13 @@ on:
   workflow_call:
     inputs:
       docker-tag:
-        required: true
+        required: false
         type: string
+        default: 24.2.0-jammy
       docker-image:
         required: false
         type: string
-        default: eventstore-ce/eventstoredb-ce
+        default: eventstore-ee/eventstoredb-commercial
 
 jobs:
   test:
@@ -26,8 +27,9 @@ jobs:
       matrix:
         framework: [ net6.0, net7.0, net8.0 ]
         os: [ ubuntu-latest ]
-        test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement, Plugins ]
+        test: [ Plugins ]
         configuration: [ release ]
+    name: ee / EventStore.Client.${{ matrix.test }} (${{ inputs.docker-tag != null && inputs.docker-tag || '24.2.0-jammy' }}, ${{ matrix.os }}, ${{ matrix.framework }})
     with:
       docker-image: ${{ inputs.docker-image != null && inputs.docker-image || 'eventstore-ee/eventstoredb-commercial' }} 
       docker-tag: ${{ inputs.docker-tag != null && inputs.docker-tag || '24.2.0-jammy' }}

diff --git a/.github/workflows/previous-lts.yml b/.github/workflows/previous-lts.yml
@@ -10,6 +10,6 @@ on:
 
 jobs:
   test:
-    uses: ./.github/workflows/base.yml
+    uses: ./.github/workflows/ce.yml
     with:
       docker-tag: previous-lts