Merge pull request #3338 from tidusjar/feature/v4-CI-improvements

Feature/v4 ci improvements

ci-build.yaml

@@ -20,7 +20,7 @@ variables:
   csProj: '**/*.csproj'
   buildConfiguration: 'Release'
   publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp3.0'
-  gitTag: 'v4.0.${Build.BuildId}'
+  gitTag: 'v4.0.$(Build.BuildId)'
 
 pool:
   vmImage: 'ubuntu-latest'
@@ -38,13 +38,6 @@ steps:
     projectDirectory: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/'
     arguments: 'run build'
 
-- task: CopyFiles@2
-  displayName: 'Publish Angular App Win10-x64'
-  inputs:
-    SourceFolder: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/dist'
-    Contents: '**'
-    TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/wwwroot'
-
 #- task: DotNetCoreCLI@2
 #  displayName: Run Unit Tests
 #  inputs:
@@ -59,6 +52,15 @@ steps:
     command: 'publish'
     publishWebProjects: true
     arguments: '-c $(buildConfiguration) -r "win10-x64"  -o $(Build.ArtifactStagingDirectory)/win-64'
+    zipAfterPublish: false
+    modifyOutputPath: false
+
+- task: CopyFiles@2
+  displayName: 'Publish Angular App Win10-x64'
+  inputs:
+    SourceFolder: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/dist'
+    Contents: '**'
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/ClientApp/dist'
 
 #- task: DotNetCoreCLI@2
 #  displayName: Publish Win10-x86
@@ -97,14 +99,14 @@ steps:
 
 ### Zip them up
 
-#- task: ArchiveFiles@2
+- task: ArchiveFiles@2
-#  displayName: Zip Win-x64
+  displayName: Zip Win-x64
-#  inputs:
+  inputs:
-#    rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/win-64'
+    rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/win-64'
-#    includeRootFolder: true
+    includeRootFolder: false
-#    archiveType: 'zip'
+    archiveType: 'zip'
-#    archiveFile: '$(Build.ArtifactStagingDirectory)/win-x64-$(Build.BuildId).zip'
+    archiveFile: '$(Build.ArtifactStagingDirectory)/win-x64-$(Build.BuildId).zip'
-#    replaceExistingArchive: true
+    replaceExistingArchive: true
 
 #- task: ArchiveFiles@2
 #  displayName: Zip Win-x86
@@ -166,9 +168,10 @@ steps:
     action: 'create'
     target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672'
     tagSource: 'userSpecifiedTag'
-    tag: '${gitTag}'
+    tag: '$(gitTag)'
     releaseNotesSource: 'inline'
     releaseNotesInline: 'test'
+    assets: '$(Build.ArtifactStagingDirectory)/*.zip'
     isPreRelease: true
     changeLogCompareToRelease: 'lastFullRelease'
     changeLogType: 'commitBased'

src/Ombi/Ombi.csproj

@@ -102,17 +102,4 @@
     <Exec WorkingDirectory="$(SpaRoot)" Command="yarn install" />
   </Target>
 
-  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
-    <Exec WorkingDirectory="$(SpaRoot)" Command="yarn install" />
-    <Exec WorkingDirectory="$(SpaRoot)" Command="yarn run build" />
-    <ItemGroup>
-    <DistFiles Include="$(SpaRoot)dist\**; $(SpaRoot)dist-server\**" />
-    <DistFiles Include="$(SpaRoot)node_modules\**" Condition="'$(BuildServerSideRenderer)' == 'true'" />
-    <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
-      <RelativePath>%(DistFiles.Identity)</RelativePath>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </ResolvedFileToPublish>
-  </ItemGroup>
-  </Target>
-
 </Project>