diff options
| author | Simon McVittie <smcv@collabora.com> | 2023-12-01 18:09:05 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2023-12-01 18:09:05 +0000 |
| commit | c807028db49ed418bf1c34b2c9469d46f4023a4a (patch) | |
| tree | 734291d4aea6fb712c2ca905439e935bd816fc54 | |
| parent | 172aa1c474759fe96b2072edcc22622ed1cb0510 (diff) | |
| parent | 79e33f2a3f17bed7718d3c72092dda32206eb09c (diff) | |
Merge branch 'fix-ci-build' into 'master'
CI: force update opensuse image to a newer version
Closes #487
See merge request dbus/dbus!451
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 19 |
2 files changed, 10 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b385858d..d1ddd816 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,19 +69,19 @@ variables: .debian-vars: variables: FDO_DISTRIBUTION_VERSION: 'bullseye-slim' - FDO_DISTRIBUTION_TAG: '2022-04-17' # Bump this version on every ci-install.sh change + FDO_DISTRIBUTION_TAG: '2022-04-17' # Bump this version on every ci-install.sh or dist version change .opensuse-vars: variables: FDO_DISTRIBUTION_VERSION: 'leap' - FDO_DISTRIBUTION_TAG: '2023-05-12.0' # Bump this version on every ci-install.sh change + FDO_DISTRIBUTION_TAG: '2023-12-01' # Bump this version on every ci-install.sh or dist version change .freebsd-vars: variables: BUILD_OS: freebsd BUILD_ARCH: "x86_64" FDO_DISTRIBUTION_VERSION: '13.1' - FDO_DISTRIBUTION_TAG: '2022-09-21.0' # Bump this version on every ci-install.sh change + FDO_DISTRIBUTION_TAG: '2022-09-21.0' # Bump this version on every ci-install.sh or dist version change FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" .cmake-common: 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 |