Merge pull request #102 from dscho/move-i686-to-msys2-runtime-3.3

msys2-runtime-3.3: replace msys2-runtime in i686 setups

Author: dscho

.ci/ci-build.sh

@@ -34,6 +34,11 @@ execute 'Approving recipe quality' check_recipe_quality
 
 message 'Building packages'
 for package in "${packages[@]}"; do
+    test msys2-runtime-3.3 != "${package}" || {
+        echo "Skipping ${package}: we only need to build this for i686" >&2
+        continue
+    }
+
     echo "::group::[build] ${package}"
     execute 'Fetch keys' "$DIR/fetch-validpgpkeys.sh"
     execute 'Building binary' makepkg --noconfirm --noprogressbar --nocheck --syncdeps --rmdeps --cleanbuild

msys2-runtime-3.3/PKGBUILD

@@ -4,7 +4,7 @@
 pkgbase=msys2-runtime-3.3
 pkgname=('msys2-runtime-3.3' 'msys2-runtime-3.3-devel')
 pkgver=3.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686')
 url="https://www.cygwin.com/"
@@ -298,6 +298,8 @@ package_msys2-runtime-3.3() {
   replaces=('catgets' 'libcatgets')
   #install=msys2-runtime.install
 
+  test i686-pc-msys != "$CHOST" || replaces+=('msys2-runtime')
+
   mkdir -p "${pkgdir}"/usr
   cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/
   rm -f "${pkgdir}"/usr/bin/msys-2.0.dbg
@@ -318,6 +320,8 @@ package_msys2-runtime-3.3-devel() {
   conflicts=('libcatgets-devel' 'msys2-runtime-devel')
   replaces=('libcatgets-devel')
 
+  test i686-pc-msys != "$CHOST" || replaces+=('msys2-runtime-devel')
+
   mkdir -p "${pkgdir}"/usr/bin
   cp -f "${srcdir}"/dest/usr/bin/msys-2.0.dbg "${pkgdir}"/usr/bin/
   cp -rLf "${srcdir}"/dest/usr/${CHOST}/include "${pkgdir}"/usr/