[OMPT-svn-commit] OpenMPT r20280 - in branches/OpenMPT-1.31: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 13:47:12 2024
New Revision: 20280
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20280

Log:
Merged revision(s) 20271-20272, 20274-20276 from trunk/OpenMPT:
[Imp] build: CI: GitHub: CPA: FreeBSD: Add full matrix build with system/local/small dependencies.
........
[Ref] build: CI: GitHub: CPA: FreeBSD: Proper filename
........
[Fix] build: CI: GitHub: CPA: FreeBSD: Hardcode CPA version in matrix build.
........
[Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3.
........
[Ref] build: CI: GitHub: CPA: FreeBSD: Delete non-matrix builds.
........

Added:
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
      - copied, changed from r20272, trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
Deleted:
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.3-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml
Modified:
   branches/OpenMPT-1.31/   (props changed)

Copied and modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml (from r20272, trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 12:55:40 2024	(r20272, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Fri Mar  8 13:47:12 2024	(r20280)
@@ -2,9 +2,7 @@
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    branches: [ OpenMPT-1.31 ]
 
 jobs:
   build:
@@ -12,12 +10,12 @@
     strategy:
       matrix:
         include:
-          - { version: 14.0, deps: sys  , cpa: v0.23.0 }
-          - { version: 14.0, deps: local, cpa: v0.23.0 }
-          - { version: 14.0, deps: small, cpa: v0.23.0 }
-          - { version: 13.2, deps: sys  , cpa: v0.23.0 }
-          - { version: 13.2, deps: local, cpa: v0.23.0 }
-          - { version: 13.2, deps: small, cpa: v0.23.0 }
+          - { version: 14.0, deps: sys   }
+          - { version: 14.0, deps: local }
+          - { version: 14.0, deps: small }
+          - { version: 13.3, deps: sys   }
+          - { version: 13.3, deps: local }
+          - { version: 13.3, deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
@@ -29,7 +27,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -41,7 +39,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -54,7 +52,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -67,7 +65,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -80,7 +78,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@${{matrix.cpa}}
+      uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9
       with:
         architecture: x86_64
         hypervisor: qemu