Skip to content

Commit

Permalink
Fixup workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
josephcummings committed Jun 4, 2024
1 parent da61e84 commit 83f55b0
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 56 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
test:
timeout-minutes: 20
runs-on: ${{ inputs.os }}
name: EventStore.Client.${{ inputs.test }}/${{ inputs.os }}/${{ inputs.framework }}/${{ inputs.docker-tag }}
name: EventStore.Client.${{ inputs.test }} (${{ inputs.os }}, ${{ inputs.framework }})
env:
CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
steps:
Expand All @@ -58,10 +58,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:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ jobs:
os: [ ubuntu-latest ]
test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
configuration: [ release ]
name: ${{ matrix.test }}
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 }}
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test CI
name: CI

on:
pull_request:
Expand All @@ -10,6 +10,11 @@ on:

jobs:
test:
uses: ./.github/workflows/base.yml
uses: ./.github/workflows/ce.yml
strategy:
fail-fast: false
matrix:
docker-tag: [ ci, lts, previous-lts ]
name: Test ${{ matrix.docker-tag }}
with:
docker-tag: ci
docker-tag: ${{ matrix.docker-tag }}
12 changes: 6 additions & 6 deletions .github/workflows/dispatch-ce.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }}
12 changes: 6 additions & 6 deletions .github/workflows/dispatch-ee.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }}
8 changes: 5 additions & 3 deletions .github/workflows/ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: ${{ matrix.test }}
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' }}
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/lts.yml

This file was deleted.

15 changes: 0 additions & 15 deletions .github/workflows/previous-lts.yml

This file was deleted.

0 comments on commit 83f55b0

Please sign in to comment.