Updated yaml

RocketSurgeonsGuild · Jun 18, 2020 · 0532600 · 0532600
1 parent 9a2f5fe
commit 0532600
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,11 +20,13 @@ on:
   push:
     branches:
       - master
+      - next
     tags:
       - v*
   pull_request:
     branches:
       - master
+      - next
 
 jobs:
   Build:
@@ -54,20 +56,14 @@ jobs:
         run: |
           $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
           $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
-          $directories = Get-ChildItem $ENV:DOTNET_ROOT | Where-Object { $_.Name -ne $version };
+          $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
           foreach ($dir in $directories) {
           $from = $dir.FullName;
-          $to = "$root/$version/$($dir.Name)";
+          $to = "$root/$version";
           Write-Host Copying from $from to $to;
-          Copy-Item $from $to -Recurse -Force;
+          Copy-Item "$from\*" $to -Recurse -Force;
           }
-      - name: 📲 Install GitVersion
-        uses: gittools/actions/gitversion/setup@master
-        with:
-          versionSpec: '5.1.x'
-      - name: 🔨 Use GitVersion
-        id: gitversion
-        uses: gittools/actions/gitversion/execute@master
+          
       - name: 🎁 dotnet tool restore
         run: |
           dotnet tool restore

diff --git a/azure-pipelines.nuke.yml b/azure-pipelines.nuke.yml
@@ -9,23 +9,21 @@
 #
 #     - To trigger manual generation invoke:
 #
-#         nuke --configure-build-server --host AzurePipelines
+#         nuke --generate-configuration AzurePipelines --host AzurePipelines
 #
 # </auto-generated>
 # ------------------------------------------------------------------------------
 
 #
 parameters:
-  Configuration: 'Release'
   Artifacts: ''
   Coverage: ''
+  Configuration: 'Release'
   Verbosity: 'Normal'
 steps:
-  - pwsh: ./build.ps1 BuildVersion Clean --skip --configuration '${{ parameters.Configuration }}' --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --verbosity '${{ parameters.Verbosity }}'
-    displayName: 'Clean'
-  - pwsh: ./build.ps1 Build --skip --configuration '${{ parameters.Configuration }}' --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --verbosity '${{ parameters.Verbosity }}'
+  - pwsh: ./build.ps1 Build --skip --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --configuration '${{ parameters.Configuration }}' --verbosity '${{ parameters.Verbosity }}'
     displayName: '⚙ Build'
-  - pwsh: ./build.ps1 Generate_Code_Coverage_Reports Test --skip --configuration '${{ parameters.Configuration }}' --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --verbosity '${{ parameters.Verbosity }}'
+  - pwsh: ./build.ps1 Test Trigger_Code_Coverage_Reports Generate_Code_Coverage_Report_Cobertura Generate_Code_Coverage_Badges Generate_Code_Coverage_Summary Generate_Code_Coverage_Report --skip --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --configuration '${{ parameters.Configuration }}' --verbosity '${{ parameters.Verbosity }}'
     displayName: '🚦 Test'
-  - pwsh: ./build.ps1 Pack --skip --configuration '${{ parameters.Configuration }}' --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --verbosity '${{ parameters.Verbosity }}'
+  - pwsh: ./build.ps1 Pack --skip --artifacts '${{ parameters.Artifacts }}' --coverage '${{ parameters.Coverage }}' --configuration '${{ parameters.Configuration }}' --verbosity '${{ parameters.Verbosity }}'
     displayName: '📦 Pack'