Skip to content

Commit 1953327

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-retry-e2e
2 parents 89488c5 + a94b1b7 commit 1953327

File tree

6 files changed

+71
-9
lines changed

6 files changed

+71
-9
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,38 @@ stages:
640640
publishOnError: true
641641
includeForks: true
642642

643+
# Local development validation
644+
- template: jobs/default-build.yml
645+
parameters:
646+
jobName: Local_Windows
647+
jobDisplayName: 'Test: Windows local development validation'
648+
agentOs: Windows
649+
timeoutInMinutes: 240
650+
steps:
651+
- script: git submodule update --init
652+
displayName: Update submodules
653+
- script: ./restore.cmd
654+
displayName: Run restore.cmd
655+
- script: npm run build
656+
displayName: Build JS
657+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
658+
displayName: Build (Debug)
659+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Release
660+
displayName: Build (Release)
661+
- script: ./src/ProjectTemplates/build.cmd
662+
-test
663+
-NoRestore
664+
-NoBuild
665+
-NoBuildDeps
666+
-configuration Release
667+
displayName: Run project template tests
668+
669+
artifacts:
670+
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
671+
path: artifacts/log/
672+
publishOnError: true
673+
includeForks: true
674+
643675
# Source build
644676
- template: /eng/common/templates/job/source-build.yml
645677
parameters:

.azure/pipelines/ci.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,39 @@ extends:
701701
publishOnError: true
702702
includeForks: true
703703

704+
# Local development validation
705+
- ${{ if in(variables['Build.Reason'], 'PullRequest', 'Manual') }}:
706+
- template: .azure/pipelines/jobs/default-build.yml@self
707+
parameters:
708+
jobName: Local_Windows
709+
jobDisplayName: 'Test: Windows local development validation'
710+
agentOs: Windows
711+
timeoutInMinutes: 240
712+
steps:
713+
- script: git submodule update --init
714+
displayName: Update submodules
715+
- script: ./restore.cmd
716+
displayName: Run restore.cmd
717+
- script: npm run build
718+
displayName: Build JS
719+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
720+
displayName: Build (Debug)
721+
- script: ./eng/build.cmd -all -noBuildJava -pack -c Release
722+
displayName: Build (Release)
723+
- script: ./src/ProjectTemplates/build.cmd
724+
-test
725+
-NoRestore
726+
-NoBuild
727+
-NoBuildDeps
728+
-configuration Release
729+
displayName: Run project template tests
730+
731+
artifacts:
732+
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
733+
path: artifacts/log/
734+
publishOnError: true
735+
includeForks: true
736+
704737
# Source build
705738
- template: /eng/common/templates-official/job/source-build.yml@self
706739
parameters:

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Components/Web.JS/dist/Release/blazor.server.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Components/Web.JS/dist/Release/blazor.web.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ProjectTemplates/build.cmd

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
@ECHO OFF
22
SET RepoRoot=%~dp0..\..
3-
CALL "%RepoRoot%\eng\build.cmd" -projects "%~dp0*\*.*proj" "/p:EnforceE2ETestPrerequisites=true" %*
4-
IF %ERRORLEVEL% NEQ 0 (
5-
EXIT /b %ErrorLevel%
6-
)
3+
%RepoRoot%\eng\build.cmd -projects %~dp0**\*.*proj "/p:EnforceE2ETestPrerequisites=true" %*

0 commit comments

Comments
 (0)