diff --git a/.azure-pipelines/00-install-less.yml b/.azure-pipelines/00-install-less.yml index b53baf575f..fa78418c6c 100644 --- a/.azure-pipelines/00-install-less.yml +++ b/.azure-pipelines/00-install-less.yml @@ -3,6 +3,5 @@ parameters: steps: - script: | - sudo npm install -g less@${{ parameters.lessVersion }} - lessc --version + npm install less@${{ parameters.lessVersion }} displayName: 'Install Less ${{ parameters.lessVersion }}' diff --git a/.azure-pipelines/00-install-node.yml b/.azure-pipelines/00-install-node.yml new file mode 100644 index 0000000000..7602068bfc --- /dev/null +++ b/.azure-pipelines/00-install-node.yml @@ -0,0 +1,8 @@ +parameters: + nodeVersion: '' + +steps: + - task: NodeTool@0 + inputs: + versionSpec: '${{ parameters.nodeVersion }}.x' + displayName: 'Install Node ${{ parameters.nodeVersion }}' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 598068893f..1f29af7460 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,6 @@ variables: lessVersion: 1.7.5 + nodeVersion: 10 pgsqlVersion: 11 phpVersion: 7.3 @@ -43,13 +44,9 @@ jobs: pool: vmImage: ubuntu-latest steps: - - template: .azure-pipelines/00-install-less.yml + - template: .azure-pipelines/00-install-node.yml parameters: - lessVersion: $(lessVersion) - - - template: .azure-pipelines/00-install-php-modules.yml - parameters: - phpVersion: $(phpVersion) + nodeVersion: $(nodeVersion) - template: .azure-pipelines/00-install-postgresql.yml parameters: @@ -57,6 +54,14 @@ jobs: - template: .azure-pipelines/00-install-redis.yml + - template: .azure-pipelines/00-install-less.yml + parameters: + lessVersion: $(lessVersion) + + - template: .azure-pipelines/00-install-php-modules.yml + parameters: + phpVersion: $(phpVersion) + - template: .azure-pipelines/10-configure-php.yml parameters: phpVersion: $(phpVersion)