diff --git a/chain-build.sh b/chain-build.sh index 8e10052..2d6486a 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -41,17 +41,21 @@ set -o nounset set -o pipefail function usage { - echo "usage: $BASH_ARGV0 [-d] [-v] [bug-number]" + echo "usage: $BASH_ARGV0 [-P] [-d|-v] [bug-number]" exit 2 } +no_pull_requests= quiet=-q -while getopts 'dv' OPT; do +while getopts 'dPv' OPT; do case "$OPT" in d) set -o xtrace quiet= ;; + P) + no_pull_requests=1 + ;; v) quiet= ;; @@ -156,6 +160,7 @@ koji $quiet wait-repo --request --build="$verrel" "$side_tag" # Try to bump and rebuild the requiring packages: message="Rebuild against $verrel" tmp_dir="$(mktemp -td tree-sitter-chain-build.XXXXXX)" +declare -i i=0 for package in "${packages[@]}"; do fedpkg $quiet clone --branch="$branch" --depth=1 "$package" \ "$tmp_dir/$package" @@ -168,6 +173,10 @@ for package in "${packages[@]}"; do if fedpkg $quiet push; then # Build the requiring package in the side tag: fedpkg $quiet build --target="$side_tag" --nowait + elif [[ -n $no_pull_requests ]]; then + echo "Skipping $package, which would require a pull request" + skipped_packages+=("$package") + unset packages[$i] else # We lack permission for the requiring package, so submit a pull # request instead. @@ -216,6 +225,7 @@ Relates to https://bugzilla.redhat.com/show_bug.cgi?id=$bug. fi cd - >/dev/null rm -rf "$tmp_dir/$package" + i=$((i + 1)) done ## If we had permission to push to all of the repos ourselves, we could @@ -234,6 +244,9 @@ There should be builds for each of: ${pull_request_urls:+The following pull requests have been created: ${pull_request_urls[*]} +}${skipped_packages:+The following packages were skipped: + ${skipped_packages[*]} + }When all ${pull_request_urls:+pull requests are merged, and }packages are built, run: bodhi updates new --from-tag ${bug:+--bugs=$bug }... '$side_tag'" diff --git a/sources b/sources index 491ac4d..9599e8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.8.tar.gz) = 0d26d0699f61fa27b5adbc298ff53f8e0f5b9f2f1b216744200f6f50cff777c9c5a5a5b92304a4d1889fccd9d8a6dd6b7d4947bac907a91850322281f754ea53 +SHA512 (tree-sitter-0.25.10.tar.gz) = f0465a2fabe303c1b62f1f55ed08aa57372ac11370d229adcccd99b5e8067be53e92da281cdfbcd034e2ecefb33ac90a119eeac9035670ac8fbaa4242cb87a11 diff --git a/tree-sitter.spec b/tree-sitter.spec index f843f61..19fac45 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -6,7 +6,7 @@ Name: tree-sitter -Version: 0.25.8 +Version: 0.25.10 Release: %autorelease Summary: An incremental parsing system for programming tools