From: <sv...@op...> - 2024-04-04 15:35:28
|
Author: manx Date: Thu Apr 4 17:35:16 2024 New Revision: 20493 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20493 Log: Merged revision(s) 20491-20492 from trunk/OpenMPT: [Mod] build: CI: GitHub: Update NetBSD CPA to commit 141cc293701219fd2f72b3abd9ca1fc322cf7d84. [Mod] build: CI: GitHub: Update NetBSD to 10.0. ........ [Mod] build: CI: GitHub: Add NetBSD 9.3 back. ........ Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 16:08:09 2024 (r20492) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Thu Apr 4 17:35:16 2024 (r20493) @@ -11,9 +11,12 @@ fail-fast: false matrix: include: - - { version: '9.3', deps: sys } - - { version: '9.3', deps: local } - - { version: '9.3', deps: small } + - { version: '10.0', deps: sys } + - { version: '10.0', deps: local } + - { version: '10.0', deps: small } + - { version: '9.3' , deps: sys } + - { version: '9.3' , deps: local } + - { version: '9.3' , deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} @@ -25,7 +28,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -37,7 +40,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -56,7 +59,7 @@ sudo pkgin -y install help2man #sudo pkgin -y install doxygen # broken - name: Build - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -69,7 +72,7 @@ run: | gmake -j4 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@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu @@ -82,7 +85,7 @@ run: | gmake -j4 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@v0.23.0 + uses: cross-platform-actions/action@141cc293701219fd2f72b3abd9ca1fc322cf7d84 with: architecture: x86_64 hypervisor: qemu |