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 d067d9a
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ jobs:
- name: Compile
shell: bash
run: |
dotnet build --configuration ${{ inputs.configuration }} --framework ${{ inputs.framework }} src/EventStore.Client.${{ inputs.test }}
dotnet build test/EventStore.Client.${{ inputs.test }}.Tests \
--configuration ${{ inputs.configuration }} \
--framework ${{ inputs.framework }}
- name: Run Tests
shell: bash
env:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,3 @@ jobs:
os: ${{ matrix.os }}
test: ${{ matrix.test }}
configuration: ${{ matrix.configuration }}
secrets:
CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
CLOUDSMITH_CICD_TOKEN: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ on:

jobs:
test:
uses: ./.github/workflows/base.yml
uses: ./.github/workflows/ce.yml
with:
docker-tag: ci
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 }}
5 changes: 3 additions & 2 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 Down
2 changes: 1 addition & 1 deletion .github/workflows/previous-lts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ on:

jobs:
test:
uses: ./.github/workflows/base.yml
uses: ./.github/workflows/ce.yml
with:
docker-tag: previous-lts

0 comments on commit d067d9a

Please sign in to comment.