From 5a91fa7d5ec2849d271a1b5c9d142928c35fd00c Mon Sep 17 00:00:00 2001
From: Leana BESSON <leana.besson@etu.uca.fr>
Date: Wed, 24 May 2023 22:56:32 +0200
Subject: [PATCH] Restructuration

---
 .drone.yml | 88 +++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7573360..56252b2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,66 +1,66 @@
 kind: pipeline
 type: docker
-name: default
+name: Wikipet's_without_views.sln
  
 trigger:
+  branch:
+    - solution
   event:
     - push
 
 steps:
   - name: build
-    image: mcr.microsoft.com/dotnet/sdk:6.0
-    volumes:
-      - name: docs
-        path: /docs
+    image: mcr.microsoft.com/dotnet/sdk:7.0
     commands:
       - cd Sources/
-      - dotnet restore Solution.sln
-      - dotnet build Solution.sln -c Release --no-restore
-      - dotnet publish Solution.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release
+      - dotnet restore Wikipet's_without_views.sln
+      - dotnet build Wikipet's_without_views.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0
+      - dotnet publish Wikipet's_without_views.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release
+    depends_on: [clone]
 
-  - name: tests
-    image: mcr.microsoft.com/dotnet/sdk:6.0
-    commands:
-      - cd Sources/
-      - dotnet restore Solution.sln
-      - dotnet test Solution.sln --no-restore
-    depends_on: [build]
+  #- name: tests
+  #  image: mcr.microsoft.com/dotnet/sdk:7.0
+  #  commands:
+  #    - cd Sources/
+  #    - dotnet restore Wikipet's_without_views.sln
+  #    - dotnet test Wikipet's_without_views.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 Solution.sln
-      - dotnet sonarscanner begin /k:BACHELARD_Benjamin-BESSON_Leana /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 Solution.sln -c Release --no-restore
-      - dotnet test Solution.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 Solution.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release
-      - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN}
+    image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet7
     secrets: [ SECRET_SONAR_LOGIN ]
-    settings:
-      # accessible en ligne de commande par ${PLUGIN_SONAR_HOST}
+    environment:
       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
-    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer
-    failure: ignore
-    volumes:
-      - name: docs
-        path: /docs
+      project_key: Wikipets2023
+      coverage_exclusions: "Tests/**"
     commands:
+      - cd Sources/
+      - dotnet restore Wikipet's_without_views.sln
+      - dotnet sonarscanner begin /k:$${project_key} /d:sonar.host.url=$${sonar_host} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions=$${coverage_exclusions} /d:sonar.login=$${sonar_token} 
+      - dotnet build Wikipet's_without_views.sln -c Release --no-restore
+      #- dotnet test Wikipet's_without_views.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 Wikipet's_without_views.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release
+      - dotnet sonarscanner end /d:sonar.login=$${sonar_token}
+    depends_on: [build]
+
+  #- name: generate-and-deploy-docs
+  #  image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer
+  #  failure: ignore
+  #  volumes:
+  #    - name: docs
+  #      path: /docs
+  #  commands:
       #- cd Documentation/doxygen
       #- doxygen Doxyfile
-      - /entrypoint.sh
-    when:
-      branch:
-        - master
-    depends_on: [ build ]
+  #    - /entrypoint.sh
+  #  when:
+  #    branch:
+  #      - master
+  #  depends_on: [ build ]
 
-volumes:
-- name: docs
-  temp: {}
+#volumes:
+#- name: docs
+#  temp: {}