Author: manx
Date: Mon Apr 29 11:37:36 2024
New Revision: 20689
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20689
Log:
Merged revision(s) 20671, 20673, 20679-20681, 20688 from trunk/OpenMPT:
[New] build: CI: GitHub: Add Fedora builder.
........
[Fix] build: CI: GitHub: Fedora: Fix xz dependency install.
........
[Fix] build: CI: GitHub: Fedora: Workaround GitHub quirks. See <https://github.com/dorny/test-reporter/issues/131#issuecomment-881945146> and <https://github.com/actions/runner/issues/2033>.
........
[Imp] build: CI: GitHub: Fedora: Add matrix build for dependencies.
........
[New] build: CI: GitHub: Add Fedora Autotools builder.
........
[New] build: CI: GitHub: Add Fedora MinGW cross-compile builder.
........
Added:
branches/OpenMPT-1.31/.github/workflows/Fedora-Autotools.yml
- copied, changed from r20681, trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml
branches/OpenMPT-1.31/.github/workflows/Fedora-Cross-MinGW.yml
- copied, changed from r20688, trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml
branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml
- copied, changed from r20671, trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml
Modified:
branches/OpenMPT-1.31/ (props changed)
Copied and modified: branches/OpenMPT-1.31/.github/workflows/Fedora-Autotools.yml (from r20681, trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml Sun Apr 28 20:04:03 2024 (r20681, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/Fedora-Autotools.yml Mon Apr 29 11:37:36 2024 (r20689)
@@ -2,9 +2,7 @@
on:
push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
+ branches: [ OpenMPT-1.31 ]
concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
Copied and modified: branches/OpenMPT-1.31/.github/workflows/Fedora-Cross-MinGW.yml (from r20688, trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml Mon Apr 29 11:07:54 2024 (r20688, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/Fedora-Cross-MinGW.yml Mon Apr 29 11:37:36 2024 (r20689)
@@ -2,9 +2,7 @@
on:
push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
+ branches: [ OpenMPT-1.31 ]
jobs:
build:
Copied and modified: branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml (from r20671, trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 17:36:46 2024 (r20671, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml Mon Apr 29 11:37:36 2024 (r20689)
@@ -2,26 +2,36 @@
on:
push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
-
-concurrency:
- group: ${{ github.ref }}-${{ github.workflow }}
- cancel-in-progress: true
+ branches: [ OpenMPT-1.31 ]
jobs:
build:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - { deps: sys }
+ - { deps: local }
+ - { deps: small }
+
+ concurrency:
+ group: ${{ github.ref }}-${{ github.workflow }}-${{matrix.deps}}
+ cancel-in-progress: true
+
runs-on: ubuntu-latest
container:
image: fedora:latest
steps:
- - uses: actions/checkout@v4
- - name: install dependencies
- run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz-utils make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel
- - name: make
- run: make -j$(nproc) STRICT=1
- - name: make check
- run: make -j$(nproc) STRICT=1 check
+ - name: Install dependencies
+ run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: fix git
+ # https://github.com/actions/runner/issues/2033
+ run: chown -R $(id -u):$(id -g) $(pwd)
+ - name: Build
+ run: make -j$(nproc) 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
+ run: make -j$(nproc) 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
|
