[OMPT-svn-commit] OpenMPT r23122 - in branches/OpenMPT-1.31: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Tue Apr  1 14:15:36 2025
New Revision: 23122
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23122

Log:
Merged revision(s) 23120 from trunk/OpenMPT:
[Fix] build: CI: GitHub: RHEL: Add --allowerasing when installing dependencies.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/RHEL-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/RHEL-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/RHEL-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/RHEL-Autotools.yml	Tue Apr  1 14:15:14 2025	(r23121)
+++ branches/OpenMPT-1.31/.github/workflows/RHEL-Autotools.yml	Tue Apr  1 14:15:36 2025	(r23122)
@@ -40,11 +40,11 @@
       if: ${{ matrix.version == 'rockylinux:9' }}
       run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh
     - name: Install dependencies
-      run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel
+      run: dnf -y install --allowerasing subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel
     - name: Enable EPEL
       run: dnf -y install epel-release
     - name: Install EPEL dependencies
-      run: dnf -y install ccache portaudio-devel
+      run: dnf -y install --allowerasing ccache portaudio-devel
     - name: Checkout
       uses: actions/checkout@v4
     - name: fix git

Modified: branches/OpenMPT-1.31/.github/workflows/RHEL-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/RHEL-Makefile.yml	Tue Apr  1 14:15:14 2025	(r23121)
+++ branches/OpenMPT-1.31/.github/workflows/RHEL-Makefile.yml	Tue Apr  1 14:15:36 2025	(r23122)
@@ -48,11 +48,11 @@
       if: ${{ matrix.version == 'rockylinux:9' }}
       run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh
     - name: Install dependencies
-      run: dnf -y install subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel
+      run: dnf -y install --allowerasing subversion perl-XML-XPath git gawk zip unzip xz make binutils gcc gcc-c++ clang pkgconf help2man doxygen autoconf autoconf-archive automake libtool zlib-devel mpg123-devel libogg-devel libvorbis-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel
     - name: Enable EPEL
       run: dnf -y install epel-release
     - name: Install EPEL dependencies
-      run: dnf -y install ccache portaudio-devel
+      run: dnf -y install --allowerasing ccache portaudio-devel
     - name: Checkout
       uses: actions/checkout@v4
     - name: fix git