elias/booking-microservices
1
0
Fork 0
mirror of https://github.com/meysamhadeli/booking-microservices.git synced 2026-04-29 09:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: try fo fix event-store in ci-cd

Browse Source
This commit is contained in:
Pc 2023-03-11 19:59:30 +03:30
parent fe8c0f444d
commit f10fc930d6
3 changed files with 96 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
.github/workflows/ci.yml vendored
View File

@ -19,51 +19,51 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
#
- name: Build and Test Flight # - name: Build and Test Flight
uses: ./.github/actions/build-test # uses: ./.github/actions/build-test
if: success() # if: success()
id: build-test-flight-step # id: build-test-flight-step
with: # with:
project-path: 'src/Services/Flight/src/Flight.Api' # project-path: 'src/Services/Flight/src/Flight.Api'
tests-path: 'src/Services/Flight/tests/' # tests-path: 'src/Services/Flight/tests/'
# wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory # # wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory
# https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/ # # https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/
# https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not # # https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not
reports-path: ${{ github.workspace }}/**/*.cobertura.xml # reports-path: ${{ github.workspace }}/**/*.cobertura.xml
reports-output-path: ${{ github.workspace }}/output/test-results # reports-output-path: ${{ github.workspace }}/output/test-results
service-name: 'Flight' # service-name: 'Flight'
token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.GITHUB_TOKEN }}
#
- name: Build and Test Identity # - name: Build and Test Identity
uses: ./.github/actions/build-test # uses: ./.github/actions/build-test
if: success() # if: success()
id: build-test-identity-step # id: build-test-identity-step
with: # with:
project-path: 'src/Services/Identity/src/Identity.Api' # project-path: 'src/Services/Identity/src/Identity.Api'
tests-path: 'src/Services/Identity/tests/' # tests-path: 'src/Services/Identity/tests/'
# wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory # # wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory
# https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/ # # https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/
# https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not # # https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not
reports-path: ${{ github.workspace }}/**/*.cobertura.xml # reports-path: ${{ github.workspace }}/**/*.cobertura.xml
reports-output-path: ${{ github.workspace }}/output/test-results # reports-output-path: ${{ github.workspace }}/output/test-results
service-name: 'Identity' # service-name: 'Identity'
token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.GITHUB_TOKEN }}
#
- name: Build and Test Passenger # - name: Build and Test Passenger
uses: ./.github/actions/build-test # uses: ./.github/actions/build-test
if: success() # if: success()
id: build-test-passenger-step # id: build-test-passenger-step
with: # with:
project-path: 'src/Services/Passenger/src/Passenger.Api' # project-path: 'src/Services/Passenger/src/Passenger.Api'
tests-path: 'src/Services/Passenger/tests/' # tests-path: 'src/Services/Passenger/tests/'
# wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory # # wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory
# https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/ # # https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/
# https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not # # https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not
reports-path: ${{ github.workspace }}/**/*.cobertura.xml # reports-path: ${{ github.workspace }}/**/*.cobertura.xml
reports-output-path: ${{ github.workspace }}/output/test-results # reports-output-path: ${{ github.workspace }}/output/test-results
service-name: 'Passenger' # service-name: 'Passenger'
token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.GITHUB_TOKEN }}
- name: Build and Test Booking - name: Build and Test Booking
uses: ./.github/actions/build-test uses: ./.github/actions/build-test
@ -80,53 +80,53 @@ jobs:
service-name: 'Booking' service-name: 'Booking'
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Update Release Drafter # - name: Update Release Drafter
if: ${{ github.ref == 'refs/heads/main' && success() }} # if: ${{ github.ref == 'refs/heads/main' && success() }}
id: last_release # id: last_release
uses: release-drafter/release-drafter@v5 # uses: release-drafter/release-drafter@v5
env: # env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#
- name: Release Version Info # - name: Release Version Info
run: # run:
echo "Release version is:" ${{ steps.last_release.outputs.tag_name }} # echo "Release version is:" ${{ steps.last_release.outputs.tag_name }}
#
- name: Build and Publish Identity to Docker # - name: Build and Publish Identity to Docker
if: ${{ github.ref == 'refs/heads/main' && success() }} # if: ${{ github.ref == 'refs/heads/main' && success() }}
uses: ./.github/actions/docker-build-publish # uses: ./.github/actions/docker-build-publish
with: # with:
tag-name: ${{ steps.last_release.outputs.tag_name }} # tag-name: ${{ steps.last_release.outputs.tag_name }}
registry-username: ${{ secrets.DOCKERHUB_USERNAME }} # registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} # registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
dockerfile-path: 'src/Services/Identity/Dockerfile' # dockerfile-path: 'src/Services/Identity/Dockerfile'
image-name: 'booking-microservices-identity' # image-name: 'booking-microservices-identity'
#
- name: Build and Publish Flight to Docker # - name: Build and Publish Flight to Docker
if: ${{ github.ref == 'refs/heads/main' && success() }} # if: ${{ github.ref == 'refs/heads/main' && success() }}
uses: ./.github/actions/docker-build-publish # uses: ./.github/actions/docker-build-publish
with: # with:
tag-name: ${{ steps.last_release.outputs.tag_name }} # tag-name: ${{ steps.last_release.outputs.tag_name }}
registry-username: ${{ secrets.DOCKERHUB_USERNAME }} # registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} # registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
dockerfile-path: 'src/Services/Flight/Dockerfile' # dockerfile-path: 'src/Services/Flight/Dockerfile'
image-name: 'booking-microservices-flight' # image-name: 'booking-microservices-flight'
#
- name: Build and Publish Passenger to Docker # - name: Build and Publish Passenger to Docker
if: ${{ github.ref == 'refs/heads/main' && success() }} # if: ${{ github.ref == 'refs/heads/main' && success() }}
uses: ./.github/actions/docker-build-publish # uses: ./.github/actions/docker-build-publish
with: # with:
tag-name: ${{ steps.last_release.outputs.tag_name }} # tag-name: ${{ steps.last_release.outputs.tag_name }}
registry-username: ${{ secrets.DOCKERHUB_USERNAME }} # registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} # registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
dockerfile-path: 'src/Services/Passenger/Dockerfile' # dockerfile-path: 'src/Services/Passenger/Dockerfile'
image-name: 'booking-microservices-passenger' # image-name: 'booking-microservices-passenger'
#
- name: Build and Publish Booking to Docker # - name: Build and Publish Booking to Docker
if: ${{ github.ref == 'refs/heads/main' && success() }} # if: ${{ github.ref == 'refs/heads/main' && success() }}
uses: ./.github/actions/docker-build-publish # uses: ./.github/actions/docker-build-publish
with: # with:
tag-name: ${{ steps.last_release.outputs.tag_name }} # tag-name: ${{ steps.last_release.outputs.tag_name }}
registry-username: ${{ secrets.DOCKERHUB_USERNAME }} # registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
registry-password: ${{ secrets.DOCKERHUB_PASSWORD }} # registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
dockerfile-path: 'src/Services/Booking/Dockerfile' # dockerfile-path: 'src/Services/Booking/Dockerfile'
image-name: 'booking-microservices-booking' # image-name: 'booking-microservices-booking'

1
src/BuildingBlocks/TestBase/TestContainers.cs
View File

@ -97,7 +97,6 @@ public static class TestContainers
var builder = baseBuilder var builder = baseBuilder
.WithImage(EventStoreContainerConfiguration.ImageName) .WithImage(EventStoreContainerConfiguration.ImageName)
.WithName(EventStoreContainerConfiguration.Name) .WithName(EventStoreContainerConfiguration.Name)
.WithPortBinding(EventStoreContainerConfiguration.Port, true)
.Build(); .Build();
return builder; return builder;

3
src/Services/Booking/src/Booking.Api/appsettings.test.json
View File

@ -18,9 +18,6 @@
"ConnectionString": "mongodb://localhost:27017", "ConnectionString": "mongodb://localhost:27017",
"DatabaseName": "booking-db-test" "DatabaseName": "booking-db-test"
}, },
"EventStore": {
"ConnectionString": "esdb://localhost:2113?tls=false"
},
"PersistMessageOptions": { "PersistMessageOptions": {
"Interval": 30, "Interval": 30,
"Enabled": true, "Enabled": true,