Possibly fixed the build failing

ArmaAchilles · Jun 22, 2019 · d9dac1e · d9dac1e
1 parent dcdb74d
commit d9dac1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,20 +19,13 @@ jobs:
         displayName: 'Build documentation'
 
   - job: Build
+    pool: 'vs2017-win2016'
     steps:
-      - script: |
-          sudo add-apt-repository ppa:koffeinflummi/armake
-          sudo apt-get update
-          sudo apt-get install armake
+      - powershell: |
+          ./tools/make.ps1
         displayName: 'Install armake'
 
-      - script: |
-          sed --version
-          armake -v
-          zip -v
-        displayName: 'Dependency versions'
-
-      - script: |
+      - bash: |
           make releaseCI
           mv $(ls *.zip | head -n1) $(Build.ArtifactStagingDirectory)/$(ls *.zip | head -n1)
         displayName: 'Build with armake'

diff --git a/tools/make.ps1 b/tools/make.ps1
@@ -118,7 +118,7 @@ function Main {
 
     $orgLocation = Get-Location
     Set-Location -Path $projectRoot
-    foreach ($folder in "addons", "optionals") {
+    foreach ($folder in "addons") {
         New-Item "$projectRoot\@achilles\$folder" -ItemType "directory" -Force | Out-Null
         foreach ($component in Get-ChildItem -Directory "$PSScriptRoot\..\$folder") {
             Build-Directory $component