diff --git a/azure-pipelines.yml b/.github/azure-pipelines.yml similarity index 75% rename from azure-pipelines.yml rename to .github/azure-pipelines.yml index c05715d1..f16d1640 100644 --- a/azure-pipelines.yml +++ b/.github/azure-pipelines.yml @@ -6,13 +6,13 @@ pr: jobs: # WIN32 - - template: .github/jobs/win32.yml + - template: jobs/win32.yml parameters: name: Win32_x86 vmImage: 'windows-latest' platform: win32 - - template: .github/jobs/win32.yml + - template: jobs/win32.yml parameters: name: Win32_x64 vmImage: 'windows-latest' diff --git a/.github/jobs/win32.yml b/.github/jobs/win32.yml index 8445f0b3..8796dcdd 100644 --- a/.github/jobs/win32.yml +++ b/.github/jobs/win32.yml @@ -7,32 +7,33 @@ parameters: type: string jobs: - - job: ${{parameters.name}} - timeoutInMinutes: 5 - pool: - vmImage: ${{parameters.vmImage}} - variables: - solutionName: 'Win32_${{parameters.platform}}' - buildDir: 'Build/${{variables.solutionName}}' +- job: ${{parameters.name}} + timeoutInMinutes: 5 - steps: - - task: Npm@1 - inputs: - command: 'install' - workingDir: 'Test' - displayName: 'Install Babylon.js NPM packages' + pool: + vmImage: ${{parameters.vmImage}} - - script: | - cmake -B ${{variables.buildDir}} -A ${{parameters.platform}} .. - displayName: 'Generate ${{variables.solutionName}} solution' + variables: + solutionName: 'Win32_${{parameters.platform}}' + buildDir: 'Build/${{variables.solutionName}}' - - task: MSBuild@1 - inputs: - solution: '${{variables.buildDir}}/JsRuntimeHost.sln' - maximumCpuCount: true - configuration: 'RelWithDebInfo' - displayName: 'Build ${{variables.solutionName}}' + steps: + - task: Npm@1 + inputs: + command: 'install' + workingDir: 'Tests' + displayName: 'Install NPM packages' - - script: UnitTests - workingDirectory: `${{variables.buildDir}}/Tests/UnitTests/RelWithDebInfo` - displayName: 'Unit Tests' + - script: cmake -B ${{variables.buildDir}} -A ${{parameters.platform}} + displayName: 'Generate ${{variables.solutionName}} solution' + + - task: MSBuild@1 + inputs: + solution: '${{variables.buildDir}}/JsRuntimeHost.sln' + maximumCpuCount: true + configuration: 'RelWithDebInfo' + displayName: 'Build ${{variables.solutionName}}' + + - script: UnitTests.exe + workingDirectory: '${{variables.buildDir}}/Tests/UnitTests/RelWithDebInfo' + displayName: 'Unit Tests'