Skip to content

Commit 4727982

Browse files
manxoristmanxorist
committed
Merged revision(s) 23649, 23663 from trunk/OpenMPT:
[New] build: CI: GitHub: RHEL: Add RHEL 10. ........ [Fix] build: CI: GitHub: RHEL: Rocky Linux 10 does not provide official Docker containers yet. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32@23664 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent be404a3 commit 4727982

2 files changed

Lines changed: 36 additions & 16 deletions

File tree

‎.github/workflows/RHEL-Autotools.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- { version: 'almalinux:8' }
15-
- { version: 'almalinux:9' }
16-
- { version: 'rockylinux:8' }
17-
- { version: 'rockylinux:9' }
14+
- { version: 'almalinux:8' }
15+
- { version: 'almalinux:9' }
16+
- { version: 'almalinux:10' }
17+
- { version: 'rockylinux:8' }
18+
- { version: 'rockylinux:9' }
19+
# - { version: 'rockylinux:10' }
1820

1921
concurrency:
2022
group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
@@ -33,12 +35,18 @@ jobs:
3335
- name: Setup repositories
3436
if: ${{ matrix.version == 'almalinux:9' }}
3537
run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh
38+
- name: Setup repositories
39+
if: ${{ matrix.version == 'almalinux:10' }}
40+
run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh
3641
- name: Setup repositories
3742
if: ${{ matrix.version == 'rockylinux:8' }}
3843
run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh
3944
- name: Setup repositories
4045
if: ${{ matrix.version == 'rockylinux:9' }}
4146
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
47+
- name: Setup repositories
48+
if: ${{ matrix.version == 'rockylinux:10' }}
49+
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
4250
- name: Install dependencies
4351
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
4452
- name: Enable EPEL

‎.github/workflows/RHEL-Makefile.yml‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,24 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- { version: 'almalinux:8' , deps: sys }
15-
- { version: 'almalinux:8' , deps: local }
16-
- { version: 'almalinux:8' , deps: small }
17-
- { version: 'almalinux:9' , deps: sys }
18-
- { version: 'almalinux:9' , deps: local }
19-
- { version: 'almalinux:9' , deps: small }
20-
- { version: 'rockylinux:8', deps: sys }
21-
- { version: 'rockylinux:8', deps: local }
22-
- { version: 'rockylinux:8', deps: small }
23-
- { version: 'rockylinux:9', deps: sys }
24-
- { version: 'rockylinux:9', deps: local }
25-
- { version: 'rockylinux:9', deps: small }
14+
- { version: 'almalinux:8' , deps: sys }
15+
- { version: 'almalinux:8' , deps: local }
16+
- { version: 'almalinux:8' , deps: small }
17+
- { version: 'almalinux:9' , deps: sys }
18+
- { version: 'almalinux:9' , deps: local }
19+
- { version: 'almalinux:9' , deps: small }
20+
- { version: 'almalinux:10' , deps: sys }
21+
- { version: 'almalinux:10' , deps: local }
22+
- { version: 'almalinux:10' , deps: small }
23+
- { version: 'rockylinux:8' , deps: sys }
24+
- { version: 'rockylinux:8' , deps: local }
25+
- { version: 'rockylinux:8' , deps: small }
26+
- { version: 'rockylinux:9' , deps: sys }
27+
- { version: 'rockylinux:9' , deps: local }
28+
- { version: 'rockylinux:9' , deps: small }
29+
# - { version: 'rockylinux:10', deps: sys }
30+
# - { version: 'rockylinux:10', deps: local }
31+
# - { version: 'rockylinux:10', deps: small }
2632

2733
concurrency:
2834
group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
@@ -41,12 +47,18 @@ jobs:
4147
- name: Setup repositories
4248
if: ${{ matrix.version == 'almalinux:9' }}
4349
run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh
50+
- name: Setup repositories
51+
if: ${{ matrix.version == 'almalinux:10' }}
52+
run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled crb && dnf -y install almalinux-release-devel && dnf -y clean all && dnf -y upgrade --refresh
4453
- name: Setup repositories
4554
if: ${{ matrix.version == 'rockylinux:8' }}
4655
run: dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-enabled powertools && dnf -y config-manager --set-enabled devel && dnf -y clean all && dnf -y upgrade --refresh
4756
- name: Setup repositories
4857
if: ${{ matrix.version == 'rockylinux:9' }}
4958
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
59+
- name: Setup repositories
60+
if: ${{ matrix.version == 'rockylinux:10' }}
61+
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
5062
- name: Install dependencies
5163
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
5264
- name: Enable EPEL

0 commit comments

Comments
 (0)