Disable Windows builds on the auto-tester - replace with Azure pipelines

This commit is contained in:
Sebastian Wilzbach 2020-08-30 17:34:52 +02:00
parent 39af480e23
commit 05f724cb4a
5 changed files with 52 additions and 9 deletions

View file

@ -0,0 +1,6 @@
steps:
- task: PublishPipelineArtifact@0
inputs:
artifactName: windows-$(ARCH)
targetPath: artifacts
displayName: Publish artifacts

View file

@ -14,8 +14,3 @@ steps:
bash --version
sh --login .azure-pipelines/windows.sh
displayName: Build DMD
- task: PublishPipelineArtifact@0
inputs:
artifactName: windows-$(ARCH)
targetPath: artifacts
displayName: Publish artifacts

View file

@ -1,12 +1,12 @@
# Learn more: https://aka.ms/yaml
jobs:
- job: Windows
- job: Windows_Bootstrap
timeoutInMinutes: 120
pool:
vmImage: 'vs2017-win2016'
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: 2.092.1
HOST_DMD_VERSION: 2.079.0
strategy:
matrix:
x64:
@ -17,6 +17,41 @@ jobs:
steps:
- template: .azure-pipelines/windows.yml
- job: Windows
timeoutInMinutes: 120
pool:
vmImage: 'vs2017-win2016'
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: LATEST
strategy:
matrix:
x64:
OS: Win_64
MODEL: 64
ARCH: x64
D_COMPILER: dmd
steps:
- template: .azure-pipelines/windows.yml
- template: .azure-pipelines/windows-artifact.yml
- job: Windows_OMF_Bootstrap
timeoutInMinutes: 120
pool:
vmImage: 'vs2017-win2016'
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
HOST_DMD_VERSION: 2.079.0
strategy:
matrix:
win32:
OS: Win_32
MODEL: 32
ARCH: x86
D_COMPILER: dmd
steps:
- template: .azure-pipelines/windows.yml
- job: Windows_OMF
timeoutInMinutes: 120
pool:
@ -33,6 +68,7 @@ jobs:
D_COMPILER: dmd
steps:
- template: .azure-pipelines/windows.yml
- template: .azure-pipelines/windows-artifact.yml
- job: Windows_VisualD
timeoutInMinutes: 120

View file

@ -79,8 +79,9 @@ defaulttarget: $G debdmd
# FIXME: Windows test suite uses src/dmd.exe instead of $(GENERATED)/dmd.exe
auto-tester-build: $(GEN)\build.exe
$(RUN_BUILD) "ENABLE_RELEASE=1" "ENABLE_ASSERTS=1" $@
copy $(TARGETEXE) .
echo "Windows builds have been disabled"
#$(RUN_BUILD) "ENABLE_RELEASE=1" "ENABLE_ASSERTS=1" $@
#copy $(TARGETEXE) .
dmd: $G reldmd

View file

@ -209,8 +209,13 @@ start_all_tests: $(RUNNER)
$(EXECUTE_RUNNER) all
# The auto-tester cannot run runnable_cxx as its compiler is too old
ifeq (windows,$(OS))
auto-tester-test:
echo "Windows builds have been disabled"
else
auto-tester-test: $(RUNNER)
$(EXECUTE_RUNNER) runnable compilable fail_compilation dshell
endif
$(RESULTS_DIR)/d_do_test$(EXE): tools/d_do_test.d tools/sanitize_json.d $(RESULTS_DIR)/.created
@echo "Building d_do_test tool"