Updated build pipelines

Removed SDL2 pipelines for older platforms (too slow anyway), added RPI4 64-bit DMX target (built on Manjaro)

azure-pipelines/azure-pipelines.yml

@@ -59,29 +59,20 @@ jobs:
   steps:
     - template: rpi3-sdl2.yml
 
-- job: RPI2_sdl2_32bit
+- job: RPI4_sdl2_64bit
   strategy:
     matrix:
-      rpi2-sdl2:
-        platform: 'rpi2-sdl2'
-  pool: RPI-32
-  steps:
-    - template: rpi2-sdl2.yml
-
-- job: RPI1_sdl2_32bit
-  strategy:
-    matrix:
-      rpi1-sdl2:
-        platform: 'rpi1-sdl2'
-  pool: RPI-32
+      rpi4-sdl2-64bit:
+        platform: 'pi64'
+  pool: RPI-64
   steps:
-    - template: rpi1-sdl2.yml
+    - template: pi64.yml
 
-- job: RPI4_64bit
+- job: RPI4_dmx_64bit
   strategy:
     matrix:
-      rpi4-sdl2-64bit:
-        platform: 'pi64'
+      rpi4-dmx-64bit:
+        platform: 'pi64-dispmanx'
   pool: RPI-64
   steps:
-    - template: pi64.yml
+    - template: pi64-dmx.yml

azure-pipelines/rpi1-sdl2.yml → azure-pipelines/pi64-dmx.yml

@@ -1,9 +1,9 @@
-# RPI1, SDL2, 32-bit
+# RPI4, SDL2, 64-bit
 steps:
   - checkout: self
     submodules: true
     clean: true
-    
+
   - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG"
     displayName: Set the tag name as an environment variable
 
@@ -14,9 +14,9 @@ steps:
       make -f Makefile.fs
       cp capsimg.so $(Build.SourcesDirectory)
       cd $(Build.SourcesDirectory)
-      make -j4 PLATFORM=rpi1-sdl2
-      mkdir amiberry-rpi1-sdl2-32bit
-    displayName: 'Compile for RPI1 (SDL2) 32-bit'
+      make -j4 PLATFORM=pi64-dispmanx
+      mkdir amiberry-rpi4-dmx-64bit
+    displayName: 'Compile for RPI4 DMX 64-bit'
   
   - task: CopyFiles@2
     inputs:
@@ -31,16 +31,16 @@ steps:
         savestates/**
         screenshots/**
         whdboot/**
-     TargetFolder: amiberry-rpi1-sdl2-32bit
-
+     TargetFolder: amiberry-rpi4-dmx-64bit
+  
   - task: ArchiveFiles@2
-    displayName: 'Archive rpi1_sdl2_release'
+    displayName: 'Archive pi64_dmx_release'
     inputs:
-      rootFolderOrFile: 'amiberry-rpi1-sdl2-32bit'
+      rootFolderOrFile: 'amiberry-rpi4-dmx-64bit'
       includeRootFolder: true
-      archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi1-sdl2-32bit.zip'
+      archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi4-dmx-64bit.zip'
 
   - task: PublishBuildArtifacts@1
     inputs:
      PathtoPublish: $(Build.ArtifactStagingDirectory)
-     ArtifactName: rpi1_sdl2_release
+     ArtifactName: pi64_dmx_release

azure-pipelines/pi64.yml

@@ -15,8 +15,8 @@ steps:
       cp capsimg.so $(Build.SourcesDirectory)
       cd $(Build.SourcesDirectory)
       make -j4 PLATFORM=pi64
-      mkdir amiberry-rpi4-64bit
-    displayName: 'Compile for RPI4 64-bit'
+      mkdir amiberry-rpi4-sdl2-64bit
+    displayName: 'Compile for RPI4 SDL2 64-bit'
   
   - task: CopyFiles@2
     inputs:
@@ -31,16 +31,16 @@ steps:
         savestates/**
         screenshots/**
         whdboot/**
-     TargetFolder: amiberry-rpi4-64bit
+     TargetFolder: amiberry-rpi4-sdl2-64bit
 
   - task: ArchiveFiles@2
     displayName: 'Archive pi64_release'
     inputs:
-      rootFolderOrFile: 'amiberry-rpi4-64bit'
+      rootFolderOrFile: 'amiberry-rpi4-sdl2-64bit'
       includeRootFolder: true
-      archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi4-64bit.zip'
+      archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rpi4-sdl2-64bit.zip'
 
   - task: PublishBuildArtifacts@1
     inputs:
      PathtoPublish: $(Build.ArtifactStagingDirectory)
-     ArtifactName: pi64_release
+     ArtifactName: pi64_sdl2_release