diff --git a/.drone.yml b/.drone.yml index 86e7dde..45f1445 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,6 @@ trigger: event: - push - steps: - name: build image: mcr.microsoft.com/dotnet/sdk:6.0 @@ -14,42 +13,33 @@ steps: - name: docs path: /docs commands: - - cd Sources/ + - cd EntityFramework_LoL/Sources/ - dotnet restore LeagueOfLegends.sln - dotnet build LeagueOfLegends.sln -c Release --no-restore - dotnet publish LeagueOfLegends.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release - - + + # docker image build + - name: docker-build-and-push + image: plugins/docker + settings: + dockerfile: EntityFramework_LoL/Sources/Dockerfile + context: EntityFramework_LoL/Sources/ + registry: hub.codefirst.iut.uca.fr + repo: hub.codefirst.iut.uca.fr/louis.dufour/EntityFramework + username: + from_secret: SECRET_REGISTRY_USERNAME + password: + from_secret: SECRET_REGISTRY_PASSWORD - name: tests image: mcr.microsoft.com/dotnet/sdk:6.0 commands: - - cd Sources/ + - cd EntityFramework_LoL/Sources/ - dotnet restore LeagueOfLegends.sln - - dotnet test LeagueOfLegends.sln --no-restore + - dotnet test LeagueOfLegends.sln --no-restore depends_on: [build] - - name: code-analysis - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 - commands: - - cd Sources/ - - dotnet restore LeagueOfLegends.sln - - dotnet sonarscanner begin /k:droneTemplate /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="Tests/**" /d:sonar.login=$${PLUGIN_SONAR_TOKEN} - - dotnet build LeagueOfLegends.sln -c Release --no-restore - - dotnet test LeagueOfLegends.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" - - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" - - dotnet publish LeagueOfLegends.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release - - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN} - secrets: [ SECRET_SONAR_LOGIN ] - settings: - # accessible en ligne de commande par $${PLUGIN_SONAR_HOST} - sonar_host: https://codefirst.iut.uca.fr/sonar/ - # accessible en ligne de commande par $${PLUGIN_SONAR_TOKEN} - sonar_token: - from_secret: SECRET_SONAR_LOGIN - depends_on: [tests] - - - name: generate-and-deploy-docs + - name: generate-and-deploy-docs image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer failure: ignore volumes: @@ -64,18 +54,6 @@ steps: - master depends_on: [ build ] - # docker image build - - name: docker-build-and-push - image: plugins/docker - settings: - dockerfile: Sources/Dockerfile - context: Sources/ - registry: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 - repo: hub.codefirst.iut.uca.fr/louis.dufour/EntityFramework - username: - from_secret: SECRET_REGISTRY_USERNAME - password: - from_secret: SECRET_REGISTRY_PASSWORD # container deployment - name: deploy-container @@ -85,12 +63,28 @@ steps: CONTAINERNAME: containerlol COMMAND: create OVERWRITE: true - ADMINS: louisdufour - depends_on: - - docker-build-and-push - when: - branch: - - master + depends_on: [ docker-build-and-push ] + + + - name: code-analysis + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 + commands: + - cd EntityFramework_LoL/Sources/ + - dotnet restore LeagueOfLegends.sln + - dotnet sonarscanner begin /k:EntityFramework_LoL_Louis /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="Tests/**" /d:sonar.login=$${PLUGIN_SONAR_TOKEN} + - dotnet build LeagueOfLegends.sln -c Release --no-restore + - dotnet test LeagueOfLegends.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" + - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" + - dotnet publish LeagueOfLegends.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release + - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN} + secrets: [ SECRET_SONAR_LOGIN ] + settings: + # accessible en ligne de commande par $${PLUGIN_SONAR_HOST} + sonar_host: https://codefirst.iut.uca.fr/sonar/ + # accessible en ligne de commande par $${PLUGIN_SONAR_TOKEN} + sonar_token: + from_secret: SECRET_SONAR_LOGIN + depends_on: [tests] volumes: - name: docs diff --git a/Sources/EFlib/EFRunePage.cs b/Sources/EFlib/EFRunePage.cs index 035fd18..6bc6600 100644 --- a/Sources/EFlib/EFRunePage.cs +++ b/Sources/EFlib/EFRunePage.cs @@ -11,7 +11,7 @@ namespace EFlib public class EFRunePage { public string Name { get; set; } - public ReadOnlyDictionary Runes { get; private set; } + // public ReadOnlyDictionary Runes { get; private set; } } }