Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d06603ab93 | ||
|
|
93742d5b67 |
5 changed files with 10 additions and 364 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,2 +1 @@
|
|||
/tree-sitter-*.tar.gz
|
||||
.side-tag
|
||||
/tree-sitter-0.20.0.tar.gz
|
||||
|
|
|
|||
274
chain-build.sh
274
chain-build.sh
|
|
@ -1,274 +0,0 @@
|
|||
#!/usr/bin/bash
|
||||
|
||||
# Use a side tag to build libtree-sitter and everything that depends on
|
||||
# it. Where we have no permission to do the build ourselves, raise a
|
||||
# pull request instead.
|
||||
#
|
||||
# Run in place of `fedpkg build`. E.g.,
|
||||
# fedpkg switch-branch rawhide
|
||||
# ...
|
||||
# fedpkg commit
|
||||
# fedpkg push
|
||||
# ./chain-build.sh <rhbz-number>
|
||||
|
||||
# MIT License
|
||||
#
|
||||
# Copyright (c) 2025 Peter Oliver
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
# TODO: Make this script idempotent, so that it can simply be re-run in
|
||||
# the event of failures.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
function usage {
|
||||
echo "usage: $BASH_ARGV0 [-P] [-d|-v] [bug-number]"
|
||||
exit 2
|
||||
}
|
||||
|
||||
no_pull_requests=
|
||||
quiet=-q
|
||||
while getopts 'dPv' OPT; do
|
||||
case "$OPT" in
|
||||
d)
|
||||
set -o xtrace
|
||||
quiet=
|
||||
;;
|
||||
P)
|
||||
no_pull_requests=1
|
||||
;;
|
||||
v)
|
||||
quiet=
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
done
|
||||
shift $((OPTIND - 1))
|
||||
|
||||
if (( $# == 1 )); then
|
||||
typeset -i bug=$1
|
||||
shift;
|
||||
elif (( $# > 1 )); then
|
||||
usage
|
||||
fi
|
||||
|
||||
function create_authorization_header_file {
|
||||
local type="$1"
|
||||
local filename="${tmp_dir}/${type}_authorization"
|
||||
|
||||
local auth_type
|
||||
case "$type" in
|
||||
bugzilla)
|
||||
auth_type=Bearer
|
||||
;;
|
||||
distgit)
|
||||
auth_type=token
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ ! -f "$filename" ]]; then
|
||||
(
|
||||
umask u=rwx,g=,o=
|
||||
printf 'Authorization: %s ' "$auth_type" > "$filename"
|
||||
if ! crudini --get ~/.config/rpkg/fedpkg.conf "fedpkg.$type" token \
|
||||
>> "$filename"
|
||||
then
|
||||
case "$type" in
|
||||
bugzilla)
|
||||
echo "You can get a token from https://bugzilla.redhat.com/userprefs.cgi?tab=apikey and store it with:
|
||||
( umask u=rwx,g=,o= && crudini --set ~/.config/rpkg/fedpkg.conf fedpkg.bugzilla token ... )"
|
||||
;;
|
||||
distgit)
|
||||
echo "You can get a token from https://pagure.io/settings/token/new and store it with:
|
||||
fedpkg set-pagure-token"
|
||||
;;
|
||||
esac
|
||||
return 2;
|
||||
fi
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
# Fail ASAP if unauthenticated:
|
||||
koji moshimoshi > /dev/null
|
||||
|
||||
# Install potential dependencies:
|
||||
if [[ ! -x /usr/bin/crudini \
|
||||
|| ! -x /usr/bin/jq ]]; then
|
||||
sudo dnf $quiet install -y /usr/bin/crudini /usr/bin/jq
|
||||
fi
|
||||
|
||||
branch="$(git branch --show-current)"
|
||||
|
||||
# Get a list of packages that require libtree-sitter:
|
||||
packages=($(
|
||||
dnf $quiet repoquery \
|
||||
--repo=fedora --repo=updates \
|
||||
--releasever="${branch#f}" \
|
||||
--whatrequires='libtree-sitter.so.*' \
|
||||
--qf='%{source_name}\n' \
|
||||
| grep -v '^tree-sitter$'
|
||||
))
|
||||
|
||||
# Create a new side tag (or re-use the existing one, if this script
|
||||
# failed last time it was run):
|
||||
if [[ -f .side-tag ]]; then
|
||||
side_tag="$(cat .side-tag)"
|
||||
|
||||
if fedpkg list-side-tags | grep --quiet --perl-regexp "^$side_tag\s"; then
|
||||
echo "Re-using side tag $side_tag"
|
||||
else
|
||||
echo "Side tag $side_tag no-longer exists. Will create a new one"
|
||||
side_tag=''
|
||||
fi
|
||||
fi
|
||||
if [[ -z ${side_tag:-} ]]; then
|
||||
side_tag="$(
|
||||
fedpkg request-side-tag \
|
||||
| grep --perl-regexp --only-matching "(?<=^Side tag ').*(?=')"
|
||||
)"
|
||||
echo "$side_tag" > .side-tag
|
||||
koji $quiet wait-repo --no-request "$side_tag"
|
||||
fi
|
||||
|
||||
# Build tree-sitter in the side tag:
|
||||
verrel="$(fedpkg verrel)"
|
||||
fedpkg $quiet build --target="$side_tag"
|
||||
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"
|
||||
cd "$tmp_dir/$package"
|
||||
|
||||
rpmdev-bumpspec --comment="$message" "$package.spec" >/dev/null
|
||||
git add "$package.spec"
|
||||
git commit --allow-empty --message="$message"
|
||||
|
||||
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.
|
||||
|
||||
fedpkg $quiet fork
|
||||
git fetch $quiet --unshallow
|
||||
|
||||
fas_login="$(
|
||||
git remote -v \
|
||||
| grep --perl-regexp --only-matching \
|
||||
'^(\w+)(?=\s+ssh://(\1)@pkgs\.fedoraproject\.org/forks/\1/rpms/.+ \(push\)$)'
|
||||
)"
|
||||
|
||||
git switch $quiet --create "$verrel"
|
||||
git push $quiet "$fas_login" "$verrel"
|
||||
|
||||
create_authorization_header_file distgit
|
||||
|
||||
response=$(
|
||||
curl \
|
||||
${quiet:+--silent --show-error} \
|
||||
--fail-with-body \
|
||||
--header @"$tmp_dir/distgit_authorization" \
|
||||
--data title="$message" \
|
||||
--data branch_to="$branch" \
|
||||
--data branch_from="$verrel" \
|
||||
--data repo_from="$package" \
|
||||
--data repo_from_username="$fas_login" \
|
||||
--data repo_from_namespace=rpms \
|
||||
--data initial_comment="Please build with: \`fedpkg build --target='$side_tag'\`
|
||||
${bug:+
|
||||
Relates to https://bugzilla.redhat.com/show_bug.cgi?id=$bug.
|
||||
}" \
|
||||
"https://src.fedoraproject.org/api/0/rpms/$package/pull-request/new" \
|
||||
| jq '.full_url // .'
|
||||
)
|
||||
if [[ $response == "{*" ]]; then
|
||||
echo "Could not find pull request URL in Pagure response"
|
||||
echo "$response"
|
||||
exit 2
|
||||
else
|
||||
response="${response#\"}"
|
||||
response="${response%\"}"
|
||||
pull_request_urls+=("$response")
|
||||
fi
|
||||
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
|
||||
## do this here, rather than raising and waiting for the pull requests.
|
||||
# fedpkg chain-build --target="$side_tag" : $packages
|
||||
# bodhi updates new --from-tag "$@" "$side_tag"
|
||||
|
||||
summary="Tree-sitter and dependent packages are being rebuilt for
|
||||
$verrel in side tag $side_tag. Completed builds
|
||||
will appear at:
|
||||
https://koji.fedoraproject.org/koji/builds?inherited=0&tagID=${side_tag##*-}
|
||||
|
||||
There should be builds for each of:
|
||||
tree-sitter ${packages[*]}
|
||||
|
||||
${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'"
|
||||
|
||||
echo "
|
||||
|
||||
$summary"
|
||||
|
||||
if [[ -n ${bug:-} ]]; then
|
||||
# We could probably use Kerberos here, but
|
||||
# https://bugzilla.redhat.com/docs/en/html/api/core/v1/general.html#authentication
|
||||
# says it's not supported.
|
||||
create_authorization_header_file bugzilla
|
||||
|
||||
curl \
|
||||
${quiet:+--silent --show-error} \
|
||||
${quiet:+--output /dev/null} \
|
||||
--fail-with-body \
|
||||
--header @"$tmp_dir/bugzilla_authorization" \
|
||||
--variable "summary=$summary" \
|
||||
--expand-json "{\"id\": \"$bug\", \"comment\": \"{{summary:json}}\"}" \
|
||||
"https://bugzilla.redhat.com/rest/bug/$bug/comment"
|
||||
fi
|
||||
|
||||
# Clean up.
|
||||
rm -r .side-tag "$tmp_dir"
|
||||
59
changelog
59
changelog
|
|
@ -1,59 +0,0 @@
|
|||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Apr 15 2024 Andreas Schneider <asn@redhat.com> - 0.22.5-1
|
||||
- Update to version 0.22.5
|
||||
https://github.com/tree-sitter/tree-sitter/blob/v0.22.5/CHANGELOG.md
|
||||
|
||||
* Sun Apr 14 2024 Andreas Schneider <asn@redhat.com> - 0.22.4-1
|
||||
- Update to version 0.22.4
|
||||
https://github.com/tree-sitter/tree-sitter/blob/v0.22.4/CHANGELOG.md
|
||||
|
||||
* Mon Mar 18 2024 Andreas Schneider <asn@redhat.com> - 0.22.2-1
|
||||
- Update to version 0.22.2
|
||||
https://github.com/tree-sitter/tree-sitter/blob/v0.22.2/CHANGELOG.md
|
||||
|
||||
* Mon Mar 11 2024 Andreas Schneider <asn@redhat.com> - 0.22.1-1
|
||||
- Update to version 0.22.1
|
||||
https://github.com/tree-sitter/tree-sitter/blob/v0.22.1/CHANGELOG.md
|
||||
|
||||
* Thu Feb 22 2024 Andreas Schneider <asn@redhat.com> - 0.21.0-1
|
||||
- Update to version 0.21.0
|
||||
https://github.com/tree-sitter/tree-sitter/releases/tag/v0.21.0
|
||||
|
||||
* Fri Jan 26 2024 Andreas Schneider <asn@redhat.com> - 0.20.9-1
|
||||
- Update to version 0.20.9
|
||||
https://github.com/tree-sitter/tree-sitter/releases/tag/v0.20.9
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Apr 04 2023 Andreas Schneider <asn@redhat.com> - 0.20.8-1
|
||||
- Update to version 0.20.8
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Sep 03 2022 Andreas Schneider <asn@redhat.com> - 0.20.7-1
|
||||
- Update to version 0.20.7
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Apr 04 2022 Andreas Schneider <asn@redhat.com> - 0.20.6-1
|
||||
- Update to version 0.20.6
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Dec 01 2021 Andreas Schneider <asn@redhat.com> - 0.20.1-1
|
||||
- Update to version 0.20.1
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Sat Jul 03 2021 Andreas Schneider <asn@redhat.com> - 0.20.0-2
|
||||
- Fixed libtree-sitter Require of devel package
|
||||
|
||||
* Fri Jul 02 2021 Andreas Schneider <asn@redhat.com> - 0.20.0-1
|
||||
- Initial package
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (tree-sitter-0.25.10.tar.gz) = f0465a2fabe303c1b62f1f55ed08aa57372ac11370d229adcccd99b5e8067be53e92da281cdfbcd034e2ecefb33ac90a119eeac9035670ac8fbaa4242cb87a11
|
||||
SHA512 (tree-sitter-0.20.0.tar.gz) = a51fa0af45a6a99bb74ff53c15a4d7939eb24c6720e65ec7a96f74ffbce54801f14539e071ec6a4891dae778d7dea5edcecc6dd57716cc70a891c9e6cfa55013
|
||||
|
|
|
|||
|
|
@ -1,13 +1,6 @@
|
|||
%global tree_sitter_so_version 0
|
||||
|
||||
# Keep these up-to-date with the values in lib/include/tree_sitter/api.h:
|
||||
%global tree_sitter_language_version 15
|
||||
%global tree_sitter_min_compatible_language_version 13
|
||||
|
||||
|
||||
Name: tree-sitter
|
||||
Version: 0.25.10
|
||||
Release: %autorelease
|
||||
Version: 0.20.0
|
||||
Release: 2%{?dist}
|
||||
Summary: An incremental parsing system for programming tools
|
||||
|
||||
License: MIT
|
||||
|
|
@ -33,12 +26,6 @@ edited. Tree-sitter aims to be:
|
|||
|
||||
%package -n lib%{name}
|
||||
Summary: Incremental parsing library for programming tools
|
||||
%{lua:
|
||||
for i = rpm.expand('%tree_sitter_min_compatible_language_version'),
|
||||
rpm.expand('%tree_sitter_language_version') do
|
||||
print(string.format("Provides: tree-sitter(:LANGUAGE_VERSION) = %d\n", i))
|
||||
end
|
||||
}
|
||||
|
||||
%description -n lib%{name}
|
||||
Tree-sitter is a parser generator tool and an incremental parsing
|
||||
|
|
@ -70,22 +57,11 @@ export PREFIX='%{_prefix}' LIBDIR='%{_libdir}' INCLUDEDIR='%{_includedir}'
|
|||
|
||||
find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -print
|
||||
|
||||
install -d %{buildroot}%{_datadir}/tree-sitter/queries
|
||||
|
||||
|
||||
%check
|
||||
grep -q '^#define TREE_SITTER_LANGUAGE_VERSION %tree_sitter_language_version' \
|
||||
lib/include/tree_sitter/api.h
|
||||
grep -q '^#define TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION %tree_sitter_min_compatible_language_version' \
|
||||
lib/include/tree_sitter/api.h
|
||||
|
||||
|
||||
%files -n lib%{name}
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%dir %{_datadir}/tree-sitter
|
||||
%dir %{_datadir}/tree-sitter/queries
|
||||
%{_libdir}/libtree-sitter.so.%{tree_sitter_so_version}*
|
||||
%{_libdir}/libtree-sitter.so.0*
|
||||
|
||||
%files -n lib%{name}-devel
|
||||
%{_includedir}/tree_sitter
|
||||
|
|
@ -94,4 +70,8 @@ grep -q '^#define TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION %tree_sitter_min_c
|
|||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Sat Jul 03 2021 Andreas Schneider <asn@redhat.com> - 0.20.0-2
|
||||
- Fixed libtree-sitter Require of devel package
|
||||
|
||||
* Fri Jul 02 2021 Andreas Schneider <asn@redhat.com> - 0.20.0-1
|
||||
- Initial package
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue