From: <sv...@op...> - 2024-05-08 16:17:48
|
Author: manx Date: Wed May 8 18:17:41 2024 New Revision: 20733 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20733 Log: [Imp] build: CI: GitHub: Ubuntu: Use a big matrix build. [New] build: CI: GitHub: Ubuntu: Add Autotools builders for Ubuntu. Added: trunk/OpenMPT/.github/workflows/Ubuntu-Autotools.yml - copied, changed from r20732, trunk/OpenMPT/.github/workflows/Ubuntu2204-Makefile.yml trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml - copied, changed from r20732, trunk/OpenMPT/.github/workflows/Ubuntu2204-Makefile.yml Deleted: trunk/OpenMPT/.github/workflows/Ubuntu2004-Makefile.yml trunk/OpenMPT/.github/workflows/Ubuntu2204-Makefile.yml Copied and modified: trunk/OpenMPT/.github/workflows/Ubuntu-Autotools.yml (from r20732, trunk/OpenMPT/.github/workflows/Ubuntu2204-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/Ubuntu2204-Makefile.yml Wed May 8 08:14:40 2024 (r20732, copy source) +++ trunk/OpenMPT/.github/workflows/Ubuntu-Autotools.yml Wed May 8 18:17:41 2024 (r20733) @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 Makefile +name: Ubuntu Autotools on: push: @@ -6,14 +6,22 @@ pull_request: branches: [ master ] -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true - jobs: build: - runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + include: + - { version: '24.04' } + - { version: '22.04' } + - { version: '20.04' } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools + cancel-in-progress: true + + runs-on: ubuntu-${{matrix.version}} steps: - uses: actions/checkout@v4 @@ -21,7 +29,5 @@ run: sudo apt-get update && sudo apt-get install -y subversion libxml-xpath-perl git mawk zip unzip p7zip xz-utils make binutils gcc g++ clang tcc pcc pkg-config help2man doxygen autoconf autoconf-archive automake libtool ccache zlib1g-dev libmpg123-dev libogg-dev libvorbis-dev portaudio19-dev libpulse-dev libsdl2-dev libflac-dev libsndfile1-dev libltdl-dev - name: setup parallel make run: echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV - - name: make - run: make STRICT=1 - - name: make check - run: make STRICT=1 check + - name: Build + run: ./build/autotools/autoconfiscate.sh Copied and modified: trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml (from r20732, trunk/OpenMPT/.github/workflows/Ubuntu2204-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/Ubuntu2204-Makefile.yml Wed May 8 08:14:40 2024 (r20732, copy source) +++ trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml Wed May 8 18:17:41 2024 (r20733) @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 Makefile +name: Ubuntu Makefile on: push: @@ -6,14 +6,28 @@ pull_request: branches: [ master ] -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true - jobs: build: - runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + include: + - { version: '24.04', deps: sys } + - { version: '24.04', deps: local } + - { version: '24.04', deps: small } + - { version: '22.04', deps: sys } + - { version: '22.04', deps: local } + - { version: '22.04', deps: small } + - { version: '20.04', deps: sys } + - { version: '20.04', deps: local } + - { version: '20.04', deps: small } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} + cancel-in-progress: true + + runs-on: ubuntu-${{matrix.version}} steps: - uses: actions/checkout@v4 @@ -21,7 +35,9 @@ run: sudo apt-get update && sudo apt-get install -y subversion libxml-xpath-perl git mawk zip unzip p7zip xz-utils make binutils gcc g++ clang tcc pcc pkg-config help2man doxygen autoconf autoconf-archive automake libtool ccache zlib1g-dev libmpg123-dev libogg-dev libvorbis-dev portaudio19-dev libpulse-dev libsdl2-dev libflac-dev libsndfile1-dev libltdl-dev - name: setup parallel make run: echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV - - name: make - run: make STRICT=1 - - name: make check - run: make STRICT=1 check + - name: Build + run: | + make STRICT=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 + run: | + make STRICT=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 |