diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2023-12-01 17:18:01 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2023-12-01 17:18:01 +0100 |
| commit | 79e33f2a3f17bed7718d3c72092dda32206eb09c (patch) | |
| tree | 734291d4aea6fb712c2ca905439e935bd816fc54 | |
| parent | fa713e51a633de87ad796fddb1aaf96da1207133 (diff) | |
CI: on openSUSE use cmake from the windows:mingw project instead from devel:tools:building
Since this repo is already used for mingw builds, the additional repo and
associated problems can be avoided.
| -rwxr-xr-x | tools/ci-install.sh | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 2f116ca0..d4980f49 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -218,9 +218,9 @@ case "$ci_distro" in version=$(. /etc/os-release; echo ${VERSION_ID} | sed 's, ,_,g') repo="openSUSE_Leap_$version" # Use a newer CMake (3.21) version for JUnit XML support on openSUSE Leap. - if ! zypper lr cmake > /dev/null; then - $zypper ar --refresh --no-gpgcheck --name cmake \ - "https://download.opensuse.org/repositories/devel:tools:building/$version/devel:tools:building.repo" + if ! zypper lr windows_mingw > /dev/null; then + $zypper ar --refresh --no-gpgcheck \ + "https://download.opensuse.org/repositories/windows:/mingw/$repo/windows:mingw.repo" fi ;; (opensuse-tumbleweed) @@ -247,15 +247,10 @@ case "$ci_distro" in else bits="32" fi - ( - p=$(zypper lr | grep "windows_mingw_win${bits}" || true) - if [ -z "$p" ]; then - $zypper ar --refresh --no-gpgcheck \ - "https://download.opensuse.org/repositories/windows:/mingw/$repo/windows:mingw.repo" - $zypper ar --refresh --no-gpgcheck \ - "https://download.opensuse.org/repositories/windows:/mingw:/win${bits}/$repo/windows:mingw:win${bits}.repo" - fi - ) + if ! zypper lr "windows_mingw_win${bits}" > /dev/null; then + $zypper ar --refresh --no-gpgcheck \ + "https://download.opensuse.org/repositories/windows:/mingw:/win${bits}/$repo/windows:mingw:win${bits}.repo" + fi packages=( "${packages[@]}" mingw${bits}-cross-cmake |