|
From: <sv...@op...> - 2025-11-28 20:32:18
|
Author: manx Date: Fri Nov 28 21:32:06 2025 New Revision: 24529 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=24529 Log: Merged revision(s) 24528 from branches/OpenMPT-1.31: Merged revision(s) 24524 from trunk/OpenMPT: [Ref] build: CI: GitHub: CPA: Update to v0.30.0. ........ ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml Fri Nov 28 21:31:15 2025 (r24528) +++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-Makefile.yml Fri Nov 28 21:32:06 2025 (r24529) @@ -26,7 +26,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.29.0 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -37,7 +37,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.29.0 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -50,7 +50,7 @@ sudo pkg upgrade -y 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@v0.29.0 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -62,7 +62,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_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.29.0 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -74,7 +74,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_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.29.0 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml Fri Nov 28 21:31:15 2025 (r24528) +++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-Makefile.yml Fri Nov 28 21:32:06 2025 (r24529) @@ -32,7 +32,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@9be9731e1b6dd301157acb699912067f9c1458f4 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -43,7 +43,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@9be9731e1b6dd301157acb699912067f9c1458f4 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -58,7 +58,7 @@ sudo pkg_add -I ${{ (matrix.version == '7.8') && 'autoconf-2.72p0 automake-1.18' || (matrix.version == '7.7') && 'autoconf-2.72p0 automake-1.17 pkgconf' || (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5 pkgconf' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5 pkgconf' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5 pkgconf' || 'autoconf automake pkgconf' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@9be9731e1b6dd301157acb699912067f9c1458f4 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -70,7 +70,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_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@9be9731e1b6dd301157acb699912067f9c1458f4 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G @@ -82,7 +82,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_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@9be9731e1b6dd301157acb699912067f9c1458f4 + uses: cross-platform-actions/action@v.30.0 with: architecture: x86_64 memory: 4G |