Menu
▾
▴
[OMPT-svn-commit] OpenMPT r20281 - branches/OpenMPT-1.31/.github/workflows
|
From: <sv...@op...> - 2024-03-08 12:48:27
|
Author: manx Date: Fri Mar 8 13:48:11 2024 New Revision: 20281 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20281 Log: Merged revision(s) 20277 from trunk/OpenMPT: [Imp] build: CI: GitHub: CPA: OpenBSD: Add full matrix build with system/local/small dependencies. [Imp] build: CI: GitHub: CPA: NetBSD: Add full matrix build with system/local/small dependencies. ........ Added: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml - copied, changed from r20280, branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml - copied, changed from r20280, branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml Deleted: branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml Copied and modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml (from r20280, branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml) ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-9.3-Makefile.yml Fri Mar 8 13:47:12 2024 (r20280, copy source) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 13:48:11 2024 (r20281) @@ -1,16 +1,23 @@ -name: NetBSD 9.3 Makefile +name: NetBSD Makefile on: push: branches: [ OpenMPT-1.31 ] -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true - jobs: build: + strategy: + matrix: + include: + - { 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}} + cancel-in-progress: true + runs-on: ubuntu-22.04 steps: @@ -23,7 +30,7 @@ hypervisor: qemu memory: 4G operating_system: netbsd - version: '9.3' + version: ${{matrix.version}} shell: bash sync_files: runner-to-vm shutdown_vm: false @@ -35,7 +42,7 @@ hypervisor: qemu memory: 4G operating_system: netbsd - version: '9.3' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: false @@ -54,12 +61,12 @@ hypervisor: qemu memory: 4G operating_system: netbsd - version: '9.3' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: false run: | - gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1 + 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 with: @@ -67,12 +74,12 @@ hypervisor: qemu memory: 4G operating_system: netbsd - version: '9.3' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: false run: | - gmake -j4 STRICT=1 VERBOSE=1 AUTO_DEPS=1 check + 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 with: @@ -80,7 +87,7 @@ hypervisor: qemu memory: 4G operating_system: netbsd - version: '9.3' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: true Copied and modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml (from r20280, branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml) ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-7.4-Makefile.yml Fri Mar 8 13:47:12 2024 (r20280, copy source) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 13:48:11 2024 (r20281) @@ -1,16 +1,23 @@ -name: OpenBSD 7.4 Makefile +name: OpenBSD Makefile on: push: branches: [ OpenMPT-1.31 ] -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true - jobs: build: + strategy: + matrix: + include: + - { version: 7.4, deps: sys } + - { version: 7.4, deps: local } + - { version: 7.4, deps: small } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} + cancel-in-progress: true + runs-on: ubuntu-22.04 steps: @@ -23,7 +30,7 @@ hypervisor: qemu memory: 4G operating_system: openbsd - version: '7.4' + version: ${{matrix.version}} shell: bash sync_files: runner-to-vm shutdown_vm: false @@ -35,7 +42,7 @@ hypervisor: qemu memory: 4G operating_system: openbsd - version: '7.4' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: false @@ -48,12 +55,12 @@ hypervisor: qemu memory: 4G operating_system: openbsd - version: '7.4' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: false run: | - gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 + 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@v0.23.0 with: @@ -61,12 +68,12 @@ hypervisor: qemu memory: 4G operating_system: openbsd - version: '7.4' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: false run: | - gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check + 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@v0.23.0 with: @@ -74,7 +81,7 @@ hypervisor: qemu memory: 4G operating_system: openbsd - version: '7.4' + version: ${{matrix.version}} shell: bash sync_files: false shutdown_vm: true |
