Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion script/vsts/platforms/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- template: templates/build.yml

- template: templates/test.yml
# - template: templates/test.yml

- template: templates/publish.yml
parameters:
Expand Down
62 changes: 31 additions & 31 deletions script/vsts/platforms/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- template: templates/build.yml

# core main tests
- template: templates/test.yml
# - template: templates/test.yml

- script: |
cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory)
Expand All @@ -43,40 +43,40 @@ jobs:
fileDir: $(Build.SourcesDirectory)/docs/output
condition: succeeded()

- job: macOS_tests
displayName: macOS Tests
dependsOn: macOS_build
timeoutInMinutes: 180
pool:
vmImage: macos-10.15
strategy:
maxParallel: 3
matrix:
renderer:
RunCoreRendererTests: true
RunPackageTests: false
packages-1:
RunCoreTests: false
RunPackageTests: 1
packages-2:
RunCoreTests: false
RunPackageTests: 2
# - job: macOS_tests
# displayName: macOS Tests
# dependsOn: macOS_build
# timeoutInMinutes: 180
# pool:
# vmImage: macos-10.15
# strategy:
# maxParallel: 3
# matrix:
# renderer:
# RunCoreRendererTests: true
# RunPackageTests: false
# packages-1:
# RunCoreTests: false
# RunPackageTests: 1
# packages-2:
# RunCoreTests: false
# RunPackageTests: 2

steps:
- template: templates/preparation.yml
# steps:
# - template: templates/preparation.yml

- template: templates/cache.yml
parameters:
OS: macos
# - template: templates/cache.yml
# parameters:
# OS: macos

# The artifact caching task does not work on forks, so we need to
# bootstrap again for pull requests coming from forked repositories.
- template: templates/bootstrap.yml
# - template: templates/bootstrap.yml

- template: templates/download-unzip.yml
parameters:
artifacts:
- atom-mac.zip
- atom-mac-symbols.zip
# - template: templates/download-unzip.yml
# parameters:
# artifacts:
# - atom-mac.zip
# - atom-mac-symbols.zip

- template: templates/test.yml
# - template: templates/test.yml
104 changes: 52 additions & 52 deletions script/vsts/platforms/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- template: templates/build.yml

- template: templates/test.yml
# - template: templates/test.yml


- pwsh: |
Expand Down Expand Up @@ -65,56 +65,56 @@ jobs:
fileDir: $(Build.SourcesDirectory)/out
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))

- job: Windows_tests
displayName: Windows Tests
dependsOn: Windows_build
timeoutInMinutes: 180
strategy:
maxParallel: 2
matrix:
x64_Renderer_Test1:
RunCoreMainTests: false
RunCoreRendererTests: 1
BUILD_ARCH: x64
os: windows-2019
x64_Renderer_Test2:
RunCoreMainTests: false
RunCoreRendererTests: 2
BUILD_ARCH: x64
os: windows-2019

pool:
vmImage: $(os)

variables:
AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]

steps:
- template: templates/preparation.yml

- template: templates/cache.yml
parameters:
OS: windows

- template: templates/bootstrap.yml
#- job: Windows_tests
# displayName: Windows Tests
# dependsOn: Windows_build
# timeoutInMinutes: 180
# strategy:
# maxParallel: 2
# matrix:
# x64_Renderer_Test1:
# RunCoreMainTests: false
# RunCoreRendererTests: 1
# BUILD_ARCH: x64
# os: windows-2019
# x64_Renderer_Test2:
# RunCoreMainTests: false
# RunCoreRendererTests: 2
# BUILD_ARCH: x64
# os: windows-2019

# pool:
# vmImage: $(os)

# variables:
# AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
# ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
# IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
# IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]

# steps:
# - template: templates/preparation.yml

# - template: templates/cache.yml
# parameters:
# OS: windows

# - template: templates/bootstrap.yml

# Downloading the build artifacts
- pwsh: |
if ($env:BUILD_ARCH -eq "x64") {
$env:FileID="-x64"
} else {
$env:FileID=""
}
echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax
displayName: Set FileID based on the arch

- template: templates/download-unzip.yml
parameters:
artifacts:
- atom$(FileID)-windows.zip

# Core renderer tests
- template: templates/test.yml
# - pwsh: |
# if ($env:BUILD_ARCH -eq "x64") {
# $env:FileID="-x64"
# } else {
# $env:FileID=""
# }
# echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax
# displayName: Set FileID based on the arch

# - template: templates/download-unzip.yml
# parameters:
# artifacts:
# - atom$(FileID)-windows.zip

# # Core renderer tests
# - template: templates/test.yml
4 changes: 2 additions & 2 deletions script/vsts/release-branch-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
dependsOn:
- GetReleaseVersion
- Lint
- Windows_tests
# - Windows_tests
- Linux
- macOS_tests
# - macOS_tests

variables:
ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
Expand Down