Skip to content

Commit cdd8c96

Browse files
manxoristmanxorist
committed
Merged revision(s) 23674 from trunk/OpenMPT:
[Fix] build: CI: GitHub: RHEL: Use Rocky Linux images by Rocky Linux Foundation instead of by Ducker. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@23676 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 4a1ea5f commit cdd8c96

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

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

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

2121
concurrency:
2222
group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
@@ -39,13 +39,13 @@ jobs:
3939
if: ${{ matrix.version == 'almalinux:10' }}
4040
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
4141
- name: Setup repositories
42-
if: ${{ matrix.version == 'rockylinux:8' }}
42+
if: ${{ matrix.version == 'rockylinux/rockylinux:8' }}
4343
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
4444
- name: Setup repositories
45-
if: ${{ matrix.version == 'rockylinux:9' }}
45+
if: ${{ matrix.version == 'rockylinux/rockylinux:9' }}
4646
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
4747
- name: Setup repositories
48-
if: ${{ matrix.version == 'rockylinux:10' }}
48+
if: ${{ matrix.version == 'rockylinux/rockylinux:10' }}
4949
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
5050
- name: Install dependencies
5151
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

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +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: '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 }
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/rockylinux:8' , deps: sys }
24+
- { version: 'rockylinux/rockylinux:8' , deps: local }
25+
- { version: 'rockylinux/rockylinux:8' , deps: small }
26+
- { version: 'rockylinux/rockylinux:9' , deps: sys }
27+
- { version: 'rockylinux/rockylinux:9' , deps: local }
28+
- { version: 'rockylinux/rockylinux:9' , deps: small }
29+
- { version: 'rockylinux/rockylinux:10', deps: sys }
30+
- { version: 'rockylinux/rockylinux:10', deps: local }
31+
- { version: 'rockylinux/rockylinux:10', deps: small }
3232

3333
concurrency:
3434
group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
@@ -51,13 +51,13 @@ jobs:
5151
if: ${{ matrix.version == 'almalinux:10' }}
5252
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
5353
- name: Setup repositories
54-
if: ${{ matrix.version == 'rockylinux:8' }}
54+
if: ${{ matrix.version == 'rockylinux/rockylinux:8' }}
5555
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
5656
- name: Setup repositories
57-
if: ${{ matrix.version == 'rockylinux:9' }}
57+
if: ${{ matrix.version == 'rockylinux/rockylinux:9' }}
5858
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
5959
- name: Setup repositories
60-
if: ${{ matrix.version == 'rockylinux:10' }}
60+
if: ${{ matrix.version == 'rockylinux/rockylinux:10' }}
6161
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
6262
- name: Install dependencies
6363
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

0 commit comments

Comments
 (0)