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

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

Author: manx
Date: Sat Jun  8 18:22:39 2024
New Revision: 20967
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20967

Log:
Merged revision(s) 20966 from trunk/OpenMPT:
[Fix] build: CI: GitHub: CPA: OpenBSD pkg_add cannot automatically install any ambiguous package versions, we need to explicitly pick a version.
[Fix] build: CI: GitHub: CPA: Force non-interactive mode for OpenBSD pkg_add.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Sat Jun  8 18:22:14 2024	(r20966)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Sat Jun  8 18:22:39 2024	(r20967)
@@ -51,7 +51,9 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          sudo pkg_add subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
+          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 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.24.0
       with: