diff options
author | Carlo Landmeter <clandmeter@alpinelinux.org> | 2019-02-20 23:43:40 +0000 |
---|---|---|
committer | Carlo Landmeter <clandmeter@alpinelinux.org> | 2019-02-20 23:43:40 +0000 |
commit | 0f90a804073e0372a7697e40401f12ac4fa8031e (patch) | |
tree | 305f7ef63681c7b1b77abbc382cbbc8441813604 | |
parent | 391cc884d3edfe502e2377705b8d9ec5c6952056 (diff) | |
download | alpine-drone-ci-0f90a804073e0372a7697e40401f12ac4fa8031e.tar.bz2 alpine-drone-ci-0f90a804073e0372a7697e40401f12ac4fa8031e.tar.xz |
remove obsolete commit range code
-rwxr-xr-x | scripts/build.sh | 22 | ||||
-rwxr-xr-x | scripts/setup.sh | 2 |
2 files changed, 4 insertions, 20 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 43af435..9cb7ef3 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -40,7 +40,6 @@ build_aport() { } changed_repos() { - local repo= range="$1" cd "$APORTSDIR" for repo in $REPOS; do git diff --exit-code remotes/origin/$DRONE_COMMIT_BRANCH -- $repo >/dev/null \ @@ -48,19 +47,6 @@ changed_repos() { done } -get_commit_range() { - local pr=$DRONE_PULL_REQUEST - local repo=$DRONE_REPO - local token=$GH_TOKEN - local json=$(set +x; curl -H "Authorization: token $token" \ - -fsL https://api.github.com/repos/$repo/pulls/$pr) - [ "$?" != 0 ] && die "Failed to fetch PR data" - local base_sha=$(echo "$json" | jq -r .base.sha) - local head_sha=$(echo "$json" | jq -r .head.sha) - printf "%s..%s\n" "$base_sha" "$head_sha" -} - - set_repositories_for() { local target_repo="$1" repos= repo= local release=$(get_release) @@ -74,7 +60,7 @@ set_repositories_for() { changed_aports() { cd "$APORTSDIR" - local repo="$1" range="$2" + local repo="$1" local aports=$(git diff --name-only --diff-filter=ACMR --relative="$repo" \ remotes/origin/$DRONE_COMMIT_BRANCH -- "*/APKBUILD" | xargs -I% dirname %) ap builddirs -d "$APORTSDIR/$repo" $aports 2>/dev/null | xargs -I% basename % | xargs @@ -101,11 +87,9 @@ aport_ng= sysinfo || true setup_system -commit_range=$(get_commit_range) - -for repo in $(changed_repos "$commit_range"); do +for repo in $(changed_repos); do set_repositories_for "$repo" - for pkgname in $(changed_aports "$repo" "$commit_range"); do + for pkgname in $(changed_aports "$repo"); do if build_aport "$repo" "$pkgname"; then checkapk || true aport_ok="$aport_ok $repo/$pkgname" diff --git a/scripts/setup.sh b/scripts/setup.sh index ad94053..9e80a82 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -6,7 +6,7 @@ release=${1:-edge} echo "http://dl-cdn.alpinelinux.org/alpine/$release/main" > /etc/apk/repositories apk -U upgrade -a -apk add alpine-sdk lua-aports curl jq pigz +apk add alpine-sdk lua-aports pigz rm -rf /var/cache/apk/* # use buildozer for building |