diff --git a/ci-build.sh b/ci-build.sh index bdc2d3c7b1..cc82f6990f 100644 --- a/ci-build.sh +++ b/ci-build.sh @@ -29,9 +29,9 @@ execute 'Approving recipe quality' check_recipe_quality for package in "${packages[@]}"; do execute 'Building binary' makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild execute 'Building source' makepkg --noconfirm --noprogressbar --skippgpcheck --allsource --config '/etc/makepkg_mingw64.conf' - execute 'Installing' yes:pacman --noprogressbar --upgrade *.pkg.tar.xz - deploy_enabled && mv "${package}"/*.pkg.tar.xz artifacts - deploy_enabled && mv "${package}"/*.src.tar.gz artifacts + execute 'Installing' yes:pacman --noprogressbar --upgrade *"${PKGEXT}" + deploy_enabled && mv "${package}"/*"${PKGEXT}" artifacts + deploy_enabled && mv "${package}"/*"${SRCEXT}" artifacts unset package done diff --git a/ci-library.sh b/ci-library.sh index e30e3d0693..b6b441af50 100644 --- a/ci-library.sh +++ b/ci-library.sh @@ -4,6 +4,9 @@ # Author: Renato Silva # Author: Qian Hong +PKGEXT='.pkg.tar.zst' +SRCEXT='.src.tar.gz' + # Enable colors normal=$(tput sgr0) red=$(tput setaf 1)