Restore BelleBuild target (for back-office assets) and use npm ci (um…

…braco#11364) Co-authored-by: Ronald Barendse <[email protected]>
Nuklon · Oct 19, 2021 · 69f8e54 · 69f8e54
1 parent ad66d61
commit 69f8e54
Show file tree

Hide file tree

Showing 14 changed files with 38,860 additions and 5,739 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -159,7 +159,7 @@ There are two big areas that you should know about:
   You may need to run the following commands to set up gulp properly:
   ```
   npm cache clean --force
-  npm install
+  npm ci
   npm run build
   ```
   The caching for the back office has been described as 'aggressive' so we often find it's best when making back office changes to disable caching in the browser to help you to see the changes you're making.

diff --git a/.gitignore b/.gitignore
@@ -90,7 +90,6 @@ cypress.env.json
 tests/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
 tests/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
 tests/Umbraco.Tests.AcceptanceTest/cypress/videos/
-tests/Umbraco.Tests.AcceptanceTest/package-lock.json
 tests/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
 tests/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/
 tests/Umbraco.Tests.Integration/TEMP/*

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -3,6 +3,7 @@ variables:
     buildConfiguration: Release
     SA_PASSWORD: UmbracoIntegration123!
     UmbracoBuild: AzurePipeline
+    nodeVersion: 14.18.1
 resources:
     containers:
         - container: mssql
@@ -194,12 +195,13 @@ stages:
 #                      command: build
 #                      projects: '**/Umbraco.Web.UI.csproj'
                 - task: NodeTool@0
-                  displayName: Use Node 11.x
+                  displayName: Use Node $(nodeVersion)
                   inputs:
-                       versionSpec: 11.x
+                       versionSpec: $(nodeVersion)
                 - task: Npm@1
-                  displayName: npm install (Client)
+                  displayName: npm ci (Client)
                   inputs:
+                    command: ci
                     workingDir: src\Umbraco.Web.UI.Client
                     verbose: false
                 - task: gulp@0
@@ -220,8 +222,9 @@ stages:
                           @{ username = $env:Umbraco__CMS__Unattended__UnattendedUserEmail; password = $env:Umbraco__CMS__Unattended__UnattendedUserPassword } | ConvertTo-Json | Set-Content -Path "tests\Umbraco.Tests.AcceptanceTest\cypress.env.json"
                 - task: Npm@1
                   name: PrepareTask
-                  displayName: npm install (AcceptanceTest)
+                  displayName: npm ci (AcceptanceTest)
                   inputs:
+                      command: ci
                       workingDir: 'tests\Umbraco.Tests.AcceptanceTest'
                 - task: Npm@1
                   displayName: Run Cypress (Desktop)
@@ -287,12 +290,13 @@ stages:
                       DBNAME: $(UmbracoDatabaseName)
                       SA_PASSWORD: $(SA_PASSWORD)
                 - task: NodeTool@0
-                  displayName: Use Node 11.x
+                  displayName: Use Node $(nodeVersion)
                   inputs:
-                      versionSpec: 11.x
+                      versionSpec: $(nodeVersion)
                 - task: Npm@1
-                  displayName: npm install (Client)
+                  displayName: npm ci (Client)
                   inputs:
+                      command: ci
                       workingDir: src/Umbraco.Web.UI.Client
                       verbose: false
                 - task: gulp@0
@@ -301,11 +305,16 @@ stages:
                       gulpFile: src/Umbraco.Web.UI.Client/gulpfile.js
                       targets: build
                       workingDirectory: src/Umbraco.Web.UI.Client
+                - task: DotNetCoreCLI@2
+                  displayName: dotnet build
+                  inputs:
+                      command: build
+                      projects: src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
                 - task: Bash@3
                   displayName: dotnet run
                   inputs:
                     targetType: 'inline'
-                    script: 'nohup dotnet run  -p ./src/Umbraco.Web.UI/Umbraco.Web.UI.csproj &'
+                    script: 'nohup dotnet run --no-build -p ./src/Umbraco.Web.UI/ > $(Build.ArtifactStagingDirectory)/dotnet_run_log_linux.txt &'
                 - task: Bash@3
                   displayName: Generate Cypress.env.json
                   inputs:
@@ -316,8 +325,9 @@ stages:
                     PASSWORD: $(Umbraco__CMS__Unattended__UnattendedUserPassword)
                 - task: Npm@1
                   name: PrepareTask
-                  displayName: npm install (AcceptanceTest)
+                  displayName: npm ci (AcceptanceTest)
                   inputs:
+                      command: ci
                       workingDir: 'tests/Umbraco.Tests.AcceptanceTest'
                 - task: Npm@1
                   displayName: Run Cypress (Desktop)
@@ -327,7 +337,6 @@ stages:
                       workingDir: tests/Umbraco.Tests.AcceptanceTest
                       command: 'custom'
                       customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
-
                 - task: PublishTestResults@2
                   condition: always()
                   inputs:
@@ -356,6 +365,12 @@ stages:
                   inputs:
                       targetPath: '$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/cypress/artifacts'
                       artifact: 'Test artifacts - Linux'
+                - task: PublishPipelineArtifact@1
+                  displayName: "Publish run log"
+                  condition: failed()
+                  inputs:
+                      targetPath: '$(Build.ArtifactStagingDirectory)/dotnet_run_log_linux.txt'
+                      artifact: Test Run logs - Linux
     - stage: Artifacts
       dependsOn: []
       jobs:
@@ -443,12 +458,13 @@ stages:
 
                           $ubuild.CompileJsonSchema()
                 - task: NodeTool@0
-                  displayName: Use Node 11.x
+                  displayName: Use Node $(nodeVersion)
                   inputs:
-                      versionSpec: 11.x
+                      versionSpec: $(nodeVersion)
                 - task: Npm@1
-                  displayName: npm install
+                  displayName: npm ci (Client)
                   inputs:
+                      command: ci
                       workingDir: src\Umbraco.Web.UI.Client
                       verbose: false
                 - task: gulp@0

diff --git a/build/build.ps1 b/build/build.ps1
@@ -119,10 +119,10 @@
         npm cache clean --force >> $log 2>&1
         $error.Clear() # that one can fail 'cos security bug - ignore
 
-        Write-Output "### npm install" >> $log 2>&1
-        npm install >> $log 2>&1
+        Write-Output "### npm ci" >> $log 2>&1
+        npm ci >> $log 2>&1
         Write-Output ">> $? $($error.Count)" >> $log 2>&1
-        # Don't really care about the messages from npm install making us think there are errors
+        # Don't really care about the messages from npm ci making us think there are errors
         $error.Clear()
 
         Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
@@ -489,7 +489,7 @@
     cd $src\Umbraco.Web.UI.Docs
 
     "Generating the docs and waiting before executing the next commands"
-	& npm install
+	  & npm ci
     & npx gulp docs
 
     Pop-Location

diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -24,11 +24,15 @@ const { watchTask } = require('./gulp/tasks/watchTask');
 // set default current compile mode:
 config.compile.current = config.compile.build;
 
+const coreBuild = parallel(dependencies, js, less, views);
+
 // ***********************************************************
 // These Exports are the new way of defining Tasks in Gulp 4.x
 // ***********************************************************
-exports.build = series(parallel(dependencies, js, less, views), testUnit);
-exports.dev = series(setDevelopmentMode, parallel(dependencies, js, less, views), runUnitTestServer, watchTask);
+
+exports.build = series(coreBuild, testUnit);
+exports.coreBuild = coreBuild;
+exports.dev = series(setDevelopmentMode, coreBuild, runUnitTestServer, watchTask);
 exports.watch = series(watchTask);
 //
 exports.runTests = series(setTestMode, series(js, testUnit));