Merged revision(s) 21794-21796 from trunk/OpenMPT:

[Imp] build: CI: GitHub: Add OpenBSD 7.6. ........ [Imp] build: CI: GitHub: Add OpenBSD 7.6. ........ [Imp] build: CI: GitHub: Add OpenBSD 7.6. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21799 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Oct 10, 2024 · c6365ab · c6365ab
1 parent f00344b
commit c6365ab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/OpenBSD-Autotools.yml b/.github/workflows/OpenBSD-Autotools.yml
@@ -11,6 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - { version: '7.6' }
           - { version: '7.5' }
           - { version: '7.4' }
 
@@ -24,7 +25,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -35,7 +36,7 @@ jobs:
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -46,11 +47,11 @@ jobs:
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -60,9 +61,9 @@ jobs:
         sync_files: false
         shutdown_vm: false
         run: |
-          export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
+          export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G

diff --git a/.github/workflows/OpenBSD-Makefile.yml b/.github/workflows/OpenBSD-Makefile.yml
@@ -11,6 +11,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - { version: '7.6', deps: sys   }
+          - { version: '7.6', deps: local }
+          - { version: '7.6', deps: small }
           - { version: '7.5', deps: sys   }
           - { version: '7.5', deps: local }
           - { version: '7.5', deps: small }
@@ -28,7 +31,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -39,7 +42,7 @@ jobs:
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -50,11 +53,11 @@ jobs:
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -66,7 +69,7 @@ jobs:
         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_VORBISFILE=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@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -78,7 +81,7 @@ jobs:
         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_VORBISFILE=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@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G