From ff5613a5ea40da710da4930912bbd8b4faabc573 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 14 Oct 2020 23:30:17 +0200 Subject: [PATCH] CI: Remove the old and unused deployment code --- ci-build.sh | 10 +++------- ci-library.sh | 49 ------------------------------------------------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/ci-build.sh b/ci-build.sh index 443b430cf1..035ec0b297 100644 --- a/ci-build.sh +++ b/ci-build.sh @@ -28,7 +28,6 @@ define_build_order || failure 'Could not determine build order' # Build message 'Building packages' "${packages[@]}" -execute 'Updating system' update_system execute 'Approving recipe quality' check_recipe_quality for package in "${packages[@]}"; do execute 'Building binary' makepkg-mingw --noconfirm --noprogressbar --nocheck --syncdeps --rmdeps --cleanbuild @@ -38,10 +37,7 @@ for package in "${packages[@]}"; do mv "${package}"/*"${SRCEXT}" artifacts unset package done +success 'All packages built successfully' -# Deploy -deploy_enabled && cd artifacts || success 'All packages built successfully' -execute 'Generating pacman repository' create_pacman_repository "${PACMAN_REPOSITORY_NAME:-ci-build}" -execute 'Generating build references' create_build_references "${PACMAN_REPOSITORY_NAME:-ci-build}" -execute 'SHA-256 checksums' sha256sum * -success 'All artifacts built successfully' +cd artifacts +execute 'SHA-256 checksums' sha256sum * \ No newline at end of file diff --git a/ci-library.sh b/ci-library.sh index b6b441af50..256291685c 100644 --- a/ci-library.sh +++ b/ci-library.sh @@ -94,19 +94,6 @@ _build_add() { sorted_packages+=("${package}") } -# Download previous artifact -_download_previous() { - local filenames=("${@}") - [[ "${DEPLOY_PROVIDER}" = bintray ]] || return 1 - for filename in "${filenames[@]}"; do - if ! wget --no-verbose "https://dl.bintray.com/${BINTRAY_ACCOUNT}/${BINTRAY_REPOSITORY}/${filename}"; then - rm -f "${filenames[@]}" - return 1 - fi - done - return 0 -} - # Git configuration git_config() { local name="${1}" @@ -130,14 +117,6 @@ execute(){ cd - > /dev/null } -# Update system -update_system() { - repman add ci.msys 'https://dl.bintray.com/alexpux/msys2' || return 1 - pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade --sysupgrade || return 1 - test -n "${DISABLE_QUALITY_CHECK}" && return 0 # TODO: remove this option when not anymore needed - pacman --noconfirm --needed --noprogressbar --sync ci.msys/pactoys -} - # Sort packages by dependency define_build_order() { local sorted_packages=() @@ -147,34 +126,6 @@ define_build_order() { packages=("${sorted_packages[@]}") } -# Associate artifacts with this build -create_build_references() { - local repository_name="${1}" - local references="${repository_name}.builds" - _download_previous "${references}" || touch "${references}" - for file in *; do - sed -i "/^${file}.*/d" "${references}" - printf '%-80s%s\n' "${file}" "${BUILD_URL}" >> "${references}" - done - sort "${references}" | tee "${references}.sorted" | sed -r 's/(\S+)\s.*\/([^/]+)/\2\t\1/' - mv "${references}.sorted" "${references}" -} - -# Add packages to repository -create_pacman_repository() { - local name="${1}" - _download_previous "${name}".{db,files}{,.tar.xz} - repo-add "${name}.db.tar.xz" *.pkg.tar.xz -} - -# Deployment is enabled -deploy_enabled() { - test -n "${BUILD_URL}" || return 1 - [[ "${DEPLOY_PROVIDER}" = bintray ]] || return 1 - local repository_account="$(git remote get-url origin | cut -d/ -f4)" - [[ "${repository_account,,}" = "${BINTRAY_ACCOUNT,,}" ]] -} - # Added commits list_commits() { _list_changes commits '*' '#*::' --pretty=format:'%ai::[%h] %s'