Skip to content

Commit cf73449

Browse files
authored
Merge pull request #148 from yuravk/devel-ng-0.22.0
CI updates:
2 parents 4892de6 + 77ee59b commit cf73449

1 file changed

Lines changed: 21 additions & 19 deletions

File tree

.github/workflows/elevate.yml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
description: 'ELevate 7 to 8'
1515
required: true
1616
type: boolean
17-
default: false
17+
default: true
1818

1919
to9:
2020
description: 'ELevate 8 to 9'
@@ -56,7 +56,7 @@ on:
5656
description: 'OracleLinux (7 to 8 only)'
5757
required: true
5858
type: boolean
59-
default: false
59+
default: true
6060

6161
rocky:
6262
description: 'Rocky Linux'
@@ -97,12 +97,8 @@ jobs:
9797
VARIANTS+=("almalinux 8 to almalinux 9")
9898
fi
9999
if [ "${{ inputs.to10 }}" = "true" ]; then
100-
# ELevation to AlmaLinux 10 is available for testing and NG repositories
101-
[[ "${{ inputs.repository }}" == *"testing"* || "${{ inputs.repository }}" == *"NG"* ]] && \
102-
VARIANTS+=("almalinux 9 to almalinux 10")
103-
# ELevation to AlmaLinux Kitten 10 is available for testing and NG repositories
104-
[[ "${{ inputs.repository }}" == *"testing"* || "${{ inputs.repository }}" == *"NG"* ]] && \
105-
VARIANTS+=("almalinux 9 to almalinux-kitten 10")
100+
VARIANTS+=("almalinux 9 to almalinux 10")
101+
VARIANTS+=("almalinux 9 to almalinux-kitten 10")
106102
fi
107103
fi
108104
@@ -115,9 +111,7 @@ jobs:
115111
VARIANTS+=("centos 8 to centos 9")
116112
fi
117113
if [ "${{ inputs.to10 }}" = "true" ]; then
118-
# ELevation to CentOS Stream 10 is available for testing and NG repositories
119-
[[ "${{ inputs.repository }}" == *"testing"* || "${{ inputs.repository }}" == *"NG"* ]] && \
120-
VARIANTS+=("centos 9 to centos 10")
114+
VARIANTS+=("centos 9 to centos 10")
121115
fi
122116
fi
123117
@@ -398,15 +392,23 @@ jobs:
398392
if [ "${vendor}" = "mariadb" ]; then
399393
# MariaDB server requires some packages from EPEL on EL7
400394
if [ "${source_release}" = "7" ]; then
401-
sudo dnf -y -q install epel-release
395+
cat << 'MARIADB'> /etc/yum.repos.d/mariadb.repo
396+
[mariadb-main]
397+
name = MariaDB
398+
baseurl = https://rpm.mariadb.org/11.rolling/rhel/$releasever/$basearch
399+
gpgkey= https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
400+
gpgcheck=1
401+
MARIADB
402+
403+
sudo dnf -y -q install epel-release
404+
else
405+
# Skip 'mariadb-maxscale' repository as it is broken for EL7
406+
# --os-* options to install on EuroLinux
407+
sudo curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | sudo bash -s -- \
408+
--skip-maxscale \
409+
--os-version=${source_release} \
410+
--os-type=rhel
402411
fi
403-
404-
# Skip 'mariadb-maxscale' repository as it is broken for EL7
405-
# --os-* options to install on EuroLinux
406-
sudo curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | sudo bash -s -- \
407-
--skip-maxscale \
408-
--os-version=${source_release} \
409-
--os-type=rhel
410412
sudo dnf -y install MariaDB-server
411413
res=$?
412414
fi

0 commit comments

Comments
 (0)