From c0ba576d6881e13b6d0159e751aec11b39d6a6f6 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Feb 2024 15:38:59 +0100 Subject: [PATCH 01/53] Update to version 0.21.0 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4acdf8f..33646fe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /tree-sitter-0.20.7.tar.gz /tree-sitter-0.20.8.tar.gz /tree-sitter-0.20.9.tar.gz +/tree-sitter-0.21.0.tar.gz diff --git a/sources b/sources index 3d51d96..b24af31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.20.9.tar.gz) = 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a +SHA512 (tree-sitter-0.21.0.tar.gz) = b68a6f0fcf7bf8044bc82d861baf9a445d2e100a1e3fc39b78ecf38cd529281e35350916fe9e5811173a73cbb255fc0bb3f65b6dd6d6852026a7aab56fb8030d diff --git a/tree-sitter.spec b/tree-sitter.spec index 52b3bac..8917a4e 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.20.9 +Version: 0.21.0 Release: 1%{?dist} Summary: An incremental parsing system for programming tools @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Thu Feb 22 2024 Andreas Schneider - 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 - 0.20.9-1 - Update to version 0.20.9 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.20.9 From 67e9bc2582e4a12da81069e8f2642f9e23c3d1bd Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Feb 2024 15:38:59 +0100 Subject: [PATCH 02/53] Update to version 0.21.0 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4acdf8f..33646fe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /tree-sitter-0.20.7.tar.gz /tree-sitter-0.20.8.tar.gz /tree-sitter-0.20.9.tar.gz +/tree-sitter-0.21.0.tar.gz diff --git a/sources b/sources index 3d51d96..b24af31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.20.9.tar.gz) = 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a +SHA512 (tree-sitter-0.21.0.tar.gz) = b68a6f0fcf7bf8044bc82d861baf9a445d2e100a1e3fc39b78ecf38cd529281e35350916fe9e5811173a73cbb255fc0bb3f65b6dd6d6852026a7aab56fb8030d diff --git a/tree-sitter.spec b/tree-sitter.spec index 52b3bac..8917a4e 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.20.9 +Version: 0.21.0 Release: 1%{?dist} Summary: An incremental parsing system for programming tools @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Thu Feb 22 2024 Andreas Schneider - 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 - 0.20.9-1 - Update to version 0.20.9 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.20.9 From a8324002a5ee66c037c46fa07e8e052904e6d86c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Mar 2024 09:12:20 +0100 Subject: [PATCH 03/53] Update to version 0.22.1 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 33646fe..80feacc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /tree-sitter-0.20.8.tar.gz /tree-sitter-0.20.9.tar.gz /tree-sitter-0.21.0.tar.gz +/tree-sitter-0.22.1.tar.gz diff --git a/sources b/sources index b24af31..0ec067a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.21.0.tar.gz) = b68a6f0fcf7bf8044bc82d861baf9a445d2e100a1e3fc39b78ecf38cd529281e35350916fe9e5811173a73cbb255fc0bb3f65b6dd6d6852026a7aab56fb8030d +SHA512 (tree-sitter-0.22.1.tar.gz) = fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 diff --git a/tree-sitter.spec b/tree-sitter.spec index 8917a4e..4734eda 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,13 +1,14 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.21.0 +Version: 0.22.1 Release: 1%{?dist} Summary: An incremental parsing system for programming tools License: MIT URL: https://tree-sitter.github.io/ Source0: https://github.com/tree-sitter/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: https://github.com/tree-sitter/tree-sitter/pull/3159.patch#/tree-sitter-fix-makefile.patch BuildRequires: gcc BuildRequires: make @@ -72,6 +73,11 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Mar 11 2024 Andreas Schneider - 0.22.1-1 +- Update to version 0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0 + * Thu Feb 22 2024 Andreas Schneider - 0.21.0-1 - Update to version 0.21.0 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.21.0 From bb94f91231c08b0617a40e22f0a50f366adc1fcc Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Mar 2024 15:37:20 +0100 Subject: [PATCH 04/53] Add missing patch --- tree-sitter-fix-makefile.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 tree-sitter-fix-makefile.patch diff --git a/tree-sitter-fix-makefile.patch b/tree-sitter-fix-makefile.patch new file mode 100644 index 0000000..5dc8702 --- /dev/null +++ b/tree-sitter-fix-makefile.patch @@ -0,0 +1,27 @@ +From e34c047dfe27c08c65cfb0004a6cbddcc65ba3dc Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 11 Mar 2024 15:20:07 +0100 +Subject: [PATCH] fix(make): Allow to override CFLAGS on the commandline + +If you package tree-sitter for a distribution, the distribution is +setting the CFLAGS which should be used for all packages. Allow those +flags to be used. + +Signed-off-by: Andreas Schneider +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index e1164428fa..f9e62d7e25 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ OBJ := $(SRC:.c=.o) + + # define default flags, and override to append mandatory flags + ARFLAGS := rcs +-CFLAGS := -O3 -Wall -Wextra -Wshadow -pedantic ++CFLAGS ?= -O3 -Wall -Wextra -Wshadow -pedantic + override CFLAGS += -std=c11 -fPIC -fvisibility=hidden + override CFLAGS += -Ilib/src -Ilib/src/wasm -Ilib/include + From df361898dcce77299c848c9d99fbbe9d92382614 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Mar 2024 09:12:20 +0100 Subject: [PATCH 05/53] Update to version 0.22.1 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 33646fe..80feacc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /tree-sitter-0.20.8.tar.gz /tree-sitter-0.20.9.tar.gz /tree-sitter-0.21.0.tar.gz +/tree-sitter-0.22.1.tar.gz diff --git a/sources b/sources index b24af31..0ec067a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.21.0.tar.gz) = b68a6f0fcf7bf8044bc82d861baf9a445d2e100a1e3fc39b78ecf38cd529281e35350916fe9e5811173a73cbb255fc0bb3f65b6dd6d6852026a7aab56fb8030d +SHA512 (tree-sitter-0.22.1.tar.gz) = fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 diff --git a/tree-sitter.spec b/tree-sitter.spec index 8917a4e..4734eda 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,13 +1,14 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.21.0 +Version: 0.22.1 Release: 1%{?dist} Summary: An incremental parsing system for programming tools License: MIT URL: https://tree-sitter.github.io/ Source0: https://github.com/tree-sitter/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: https://github.com/tree-sitter/tree-sitter/pull/3159.patch#/tree-sitter-fix-makefile.patch BuildRequires: gcc BuildRequires: make @@ -72,6 +73,11 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Mar 11 2024 Andreas Schneider - 0.22.1-1 +- Update to version 0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0 + * Thu Feb 22 2024 Andreas Schneider - 0.21.0-1 - Update to version 0.21.0 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.21.0 From d7bb6f5cd019453fd5945b91fd0d7c6c93aa2b92 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Mar 2024 15:37:20 +0100 Subject: [PATCH 06/53] Add missing patch --- tree-sitter-fix-makefile.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 tree-sitter-fix-makefile.patch diff --git a/tree-sitter-fix-makefile.patch b/tree-sitter-fix-makefile.patch new file mode 100644 index 0000000..5dc8702 --- /dev/null +++ b/tree-sitter-fix-makefile.patch @@ -0,0 +1,27 @@ +From e34c047dfe27c08c65cfb0004a6cbddcc65ba3dc Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 11 Mar 2024 15:20:07 +0100 +Subject: [PATCH] fix(make): Allow to override CFLAGS on the commandline + +If you package tree-sitter for a distribution, the distribution is +setting the CFLAGS which should be used for all packages. Allow those +flags to be used. + +Signed-off-by: Andreas Schneider +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index e1164428fa..f9e62d7e25 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ OBJ := $(SRC:.c=.o) + + # define default flags, and override to append mandatory flags + ARFLAGS := rcs +-CFLAGS := -O3 -Wall -Wextra -Wshadow -pedantic ++CFLAGS ?= -O3 -Wall -Wextra -Wshadow -pedantic + override CFLAGS += -std=c11 -fPIC -fvisibility=hidden + override CFLAGS += -Ilib/src -Ilib/src/wasm -Ilib/include + From 5f5852a4bfcb41630508d9cd2810970d661aa876 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 12 Mar 2024 13:35:29 +0100 Subject: [PATCH 07/53] Package CHANGELOG.md and link it in log entries --- tree-sitter.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tree-sitter.spec b/tree-sitter.spec index 4734eda..bd888d7 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -63,7 +63,7 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %files -n lib%{name} %license LICENSE -%doc README.md +%doc README.md CHANGELOG.md %{_libdir}/libtree-sitter.so.%{treesitter_so_version}* %files -n lib%{name}-devel @@ -75,8 +75,7 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog * Mon Mar 11 2024 Andreas Schneider - 0.22.1-1 - Update to version 0.22.1 - https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1 - https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0 + https://github.com/tree-sitter/tree-sitter/blob/v0.22.1/CHANGELOG.md * Thu Feb 22 2024 Andreas Schneider - 0.21.0-1 - Update to version 0.21.0 From 2c183de51c44077d9729cfb8288b9493c636317a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 18 Mar 2024 20:19:01 +0100 Subject: [PATCH 08/53] Update to version 0.22.2 --- .gitignore | 1 + sources | 2 +- tree-sitter-fix-makefile.patch | 27 --------------------------- tree-sitter.spec | 7 +++++-- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 tree-sitter-fix-makefile.patch diff --git a/.gitignore b/.gitignore index 80feacc..3c85707 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /tree-sitter-0.20.9.tar.gz /tree-sitter-0.21.0.tar.gz /tree-sitter-0.22.1.tar.gz +/tree-sitter-0.22.2.tar.gz diff --git a/sources b/sources index 0ec067a..b3d9235 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.1.tar.gz) = fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 +SHA512 (tree-sitter-0.22.2.tar.gz) = a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 diff --git a/tree-sitter-fix-makefile.patch b/tree-sitter-fix-makefile.patch deleted file mode 100644 index 5dc8702..0000000 --- a/tree-sitter-fix-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e34c047dfe27c08c65cfb0004a6cbddcc65ba3dc Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Mon, 11 Mar 2024 15:20:07 +0100 -Subject: [PATCH] fix(make): Allow to override CFLAGS on the commandline - -If you package tree-sitter for a distribution, the distribution is -setting the CFLAGS which should be used for all packages. Allow those -flags to be used. - -Signed-off-by: Andreas Schneider ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e1164428fa..f9e62d7e25 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ OBJ := $(SRC:.c=.o) - - # define default flags, and override to append mandatory flags - ARFLAGS := rcs --CFLAGS := -O3 -Wall -Wextra -Wshadow -pedantic -+CFLAGS ?= -O3 -Wall -Wextra -Wshadow -pedantic - override CFLAGS += -std=c11 -fPIC -fvisibility=hidden - override CFLAGS += -Ilib/src -Ilib/src/wasm -Ilib/include - diff --git a/tree-sitter.spec b/tree-sitter.spec index bd888d7..854f7a3 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,14 +1,13 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.1 +Version: 0.22.2 Release: 1%{?dist} Summary: An incremental parsing system for programming tools License: MIT URL: https://tree-sitter.github.io/ Source0: https://github.com/tree-sitter/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: https://github.com/tree-sitter/tree-sitter/pull/3159.patch#/tree-sitter-fix-makefile.patch BuildRequires: gcc BuildRequires: make @@ -73,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Mar 18 2024 Andreas Schneider - 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 - 0.22.1-1 - Update to version 0.22.1 https://github.com/tree-sitter/tree-sitter/blob/v0.22.1/CHANGELOG.md From e5f13cdb4894c352c9a1aa9bf1534cdc41137b6c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 18 Mar 2024 20:19:01 +0100 Subject: [PATCH 09/53] Update to version 0.22.2 --- .gitignore | 1 + sources | 2 +- tree-sitter-fix-makefile.patch | 27 --------------------------- tree-sitter.spec | 7 +++++-- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 tree-sitter-fix-makefile.patch diff --git a/.gitignore b/.gitignore index 80feacc..3c85707 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /tree-sitter-0.20.9.tar.gz /tree-sitter-0.21.0.tar.gz /tree-sitter-0.22.1.tar.gz +/tree-sitter-0.22.2.tar.gz diff --git a/sources b/sources index 0ec067a..b3d9235 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.1.tar.gz) = fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 +SHA512 (tree-sitter-0.22.2.tar.gz) = a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 diff --git a/tree-sitter-fix-makefile.patch b/tree-sitter-fix-makefile.patch deleted file mode 100644 index 5dc8702..0000000 --- a/tree-sitter-fix-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e34c047dfe27c08c65cfb0004a6cbddcc65ba3dc Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Mon, 11 Mar 2024 15:20:07 +0100 -Subject: [PATCH] fix(make): Allow to override CFLAGS on the commandline - -If you package tree-sitter for a distribution, the distribution is -setting the CFLAGS which should be used for all packages. Allow those -flags to be used. - -Signed-off-by: Andreas Schneider ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e1164428fa..f9e62d7e25 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ OBJ := $(SRC:.c=.o) - - # define default flags, and override to append mandatory flags - ARFLAGS := rcs --CFLAGS := -O3 -Wall -Wextra -Wshadow -pedantic -+CFLAGS ?= -O3 -Wall -Wextra -Wshadow -pedantic - override CFLAGS += -std=c11 -fPIC -fvisibility=hidden - override CFLAGS += -Ilib/src -Ilib/src/wasm -Ilib/include - diff --git a/tree-sitter.spec b/tree-sitter.spec index 4734eda..95e9d9d 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,14 +1,13 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.1 +Version: 0.22.2 Release: 1%{?dist} Summary: An incremental parsing system for programming tools License: MIT URL: https://tree-sitter.github.io/ Source0: https://github.com/tree-sitter/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: https://github.com/tree-sitter/tree-sitter/pull/3159.patch#/tree-sitter-fix-makefile.patch BuildRequires: gcc BuildRequires: make @@ -73,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Mar 18 2024 Andreas Schneider - 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 - 0.22.1-1 - Update to version 0.22.1 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1 From 98c24716ed038d140bd0f1e045bf75f7bf6a1d2d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 14 Apr 2024 16:49:47 +0200 Subject: [PATCH 10/53] Update to version 0.22.4 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c85707..91c5942 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /tree-sitter-0.21.0.tar.gz /tree-sitter-0.22.1.tar.gz /tree-sitter-0.22.2.tar.gz +/tree-sitter-0.22.4.tar.gz diff --git a/sources b/sources index b3d9235..689c3db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.2.tar.gz) = a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 +SHA512 (tree-sitter-0.22.4.tar.gz) = 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36 diff --git a/tree-sitter.spec b/tree-sitter.spec index 854f7a3..57f48e6 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.2 +Version: 0.22.4 Release: 1%{?dist} Summary: An incremental parsing system for programming tools @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Sun Apr 14 2024 Andreas Schneider - 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 - 0.22.2-1 - Update to version 0.22.2 https://github.com/tree-sitter/tree-sitter/blob/v0.22.2/CHANGELOG.md From b8ecdf760c4929bfbb7d5b217e3925b27e83cca8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 14 Apr 2024 16:49:47 +0200 Subject: [PATCH 11/53] Update to version 0.22.4 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c85707..91c5942 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /tree-sitter-0.21.0.tar.gz /tree-sitter-0.22.1.tar.gz /tree-sitter-0.22.2.tar.gz +/tree-sitter-0.22.4.tar.gz diff --git a/sources b/sources index b3d9235..689c3db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.2.tar.gz) = a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 +SHA512 (tree-sitter-0.22.4.tar.gz) = 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36 diff --git a/tree-sitter.spec b/tree-sitter.spec index 95e9d9d..ad28838 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.2 +Version: 0.22.4 Release: 1%{?dist} Summary: An incremental parsing system for programming tools @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Sun Apr 14 2024 Andreas Schneider - 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 - 0.22.2-1 - Update to version 0.22.2 https://github.com/tree-sitter/tree-sitter/blob/v0.22.2/CHANGELOG.md From 58cad1f31ade8919633fe6e39551aba34a74a054 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 15 Apr 2024 07:09:51 +0200 Subject: [PATCH 12/53] Update to version 0.22.5 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 91c5942..8279bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /tree-sitter-0.22.1.tar.gz /tree-sitter-0.22.2.tar.gz /tree-sitter-0.22.4.tar.gz +/tree-sitter-0.22.5.tar.gz diff --git a/sources b/sources index 689c3db..92b70a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.4.tar.gz) = 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36 +SHA512 (tree-sitter-0.22.5.tar.gz) = cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c diff --git a/tree-sitter.spec b/tree-sitter.spec index 57f48e6..9cd3863 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.4 +Version: 0.22.5 Release: 1%{?dist} Summary: An incremental parsing system for programming tools @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Apr 15 2024 Andreas Schneider - 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 - 0.22.4-1 - Update to version 0.22.4 https://github.com/tree-sitter/tree-sitter/blob/v0.22.4/CHANGELOG.md From 5770150784d8f2db1bcfd5e66db6d9ea727c2ac2 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 15 Apr 2024 07:09:51 +0200 Subject: [PATCH 13/53] Update to version 0.22.5 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 91c5942..8279bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /tree-sitter-0.22.1.tar.gz /tree-sitter-0.22.2.tar.gz /tree-sitter-0.22.4.tar.gz +/tree-sitter-0.22.5.tar.gz diff --git a/sources b/sources index 689c3db..92b70a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.4.tar.gz) = 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36 +SHA512 (tree-sitter-0.22.5.tar.gz) = cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c diff --git a/tree-sitter.spec b/tree-sitter.spec index ad28838..e1cdc4b 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.4 +Version: 0.22.5 Release: 1%{?dist} Summary: An incremental parsing system for programming tools @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Apr 15 2024 Andreas Schneider - 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 - 0.22.4-1 - Update to version 0.22.4 https://github.com/tree-sitter/tree-sitter/blob/v0.22.4/CHANGELOG.md From d1f90e04bf4cf868bda5a2ee898a6604a227fbb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:51:50 +0000 Subject: [PATCH 14/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- tree-sitter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tree-sitter.spec b/tree-sitter.spec index 9cd3863..e9c4be4 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -2,7 +2,7 @@ Name: tree-sitter Version: 0.22.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An incremental parsing system for programming tools License: MIT @@ -72,6 +72,9 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.22.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Apr 15 2024 Andreas Schneider - 0.22.5-1 - Update to version 0.22.5 https://github.com/tree-sitter/tree-sitter/blob/v0.22.5/CHANGELOG.md From 7de981f8ae3bccf9cb3eb36ede2c3b7f4971ea80 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 28 Aug 2024 09:43:48 +0200 Subject: [PATCH 15/53] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 59 +++++++++++++++++++++++++++++++++++++++++++++ tree-sitter.spec | 62 ++---------------------------------------------- 2 files changed, 61 insertions(+), 60 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..a42eebf --- /dev/null +++ b/changelog @@ -0,0 +1,59 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 0.22.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Apr 15 2024 Andreas Schneider - 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 - 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 - 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 - 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 - 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 - 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 - 0.20.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 04 2023 Andreas Schneider - 0.20.8-1 +- Update to version 0.20.8 + +* Sat Jan 21 2023 Fedora Release Engineering - 0.20.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Sep 03 2022 Andreas Schneider - 0.20.7-1 +- Update to version 0.20.7 + +* Sat Jul 23 2022 Fedora Release Engineering - 0.20.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Apr 04 2022 Andreas Schneider - 0.20.6-1 +- Update to version 0.20.6 + +* Sat Jan 22 2022 Fedora Release Engineering - 0.20.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Dec 01 2021 Andreas Schneider - 0.20.1-1 +- Update to version 0.20.1 + +* Fri Jul 23 2021 Fedora Release Engineering - 0.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 03 2021 Andreas Schneider - 0.20.0-2 +- Fixed libtree-sitter Require of devel package + +* Fri Jul 02 2021 Andreas Schneider - 0.20.0-1 +- Initial package diff --git a/tree-sitter.spec b/tree-sitter.spec index e9c4be4..23a66ff 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -2,7 +2,7 @@ Name: tree-sitter Version: 0.22.5 -Release: 2%{?dist} +Release: %autorelease Summary: An incremental parsing system for programming tools License: MIT @@ -72,62 +72,4 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 0.22.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Apr 15 2024 Andreas Schneider - 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 - 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 - 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 - 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 - 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 - 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 - 0.20.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 04 2023 Andreas Schneider - 0.20.8-1 -- Update to version 0.20.8 - -* Sat Jan 21 2023 Fedora Release Engineering - 0.20.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Sep 03 2022 Andreas Schneider - 0.20.7-1 -- Update to version 0.20.7 - -* Sat Jul 23 2022 Fedora Release Engineering - 0.20.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Apr 04 2022 Andreas Schneider - 0.20.6-1 -- Update to version 0.20.6 - -* Sat Jan 22 2022 Fedora Release Engineering - 0.20.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 01 2021 Andreas Schneider - 0.20.1-1 -- Update to version 0.20.1 - -* Fri Jul 23 2021 Fedora Release Engineering - 0.20.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 03 2021 Andreas Schneider - 0.20.0-2 -- Fixed libtree-sitter Require of devel package - -* Fri Jul 02 2021 Andreas Schneider - 0.20.0-1 -- Initial package +%autochangelog From 31664be7588b1016f39d77763b8755e4f39d0b5a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 28 Aug 2024 09:45:05 +0200 Subject: [PATCH 16/53] Update to version 0.23.0 - https://github.com/tree-sitter/tree-sitter/blob/v0.23.0/CHANGELOG.md --- .gitignore | 12 +----------- sources | 2 +- tree-sitter.spec | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 8279bc3..df75da3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ -/tree-sitter-0.20.0.tar.gz -/tree-sitter-0.20.1.tar.gz -/tree-sitter-0.20.6.tar.gz -/tree-sitter-0.20.7.tar.gz -/tree-sitter-0.20.8.tar.gz -/tree-sitter-0.20.9.tar.gz -/tree-sitter-0.21.0.tar.gz -/tree-sitter-0.22.1.tar.gz -/tree-sitter-0.22.2.tar.gz -/tree-sitter-0.22.4.tar.gz -/tree-sitter-0.22.5.tar.gz +/tree-sitter-*.tar.gz diff --git a/sources b/sources index 92b70a7..782e8b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.5.tar.gz) = cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c +SHA512 (tree-sitter-0.23.0.tar.gz) = ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9 diff --git a/tree-sitter.spec b/tree-sitter.spec index 23a66ff..c438cac 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.5 +Version: 0.23.0 Release: %autorelease Summary: An incremental parsing system for programming tools From 13d8e758049a29eba1e3b8ad1f2236d2d529a8f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:51:50 +0000 Subject: [PATCH 17/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- tree-sitter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tree-sitter.spec b/tree-sitter.spec index e1cdc4b..39f106c 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -2,7 +2,7 @@ Name: tree-sitter Version: 0.22.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An incremental parsing system for programming tools License: MIT @@ -72,6 +72,9 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.22.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Apr 15 2024 Andreas Schneider - 0.22.5-1 - Update to version 0.22.5 https://github.com/tree-sitter/tree-sitter/blob/v0.22.5/CHANGELOG.md From e38fa7212dcbd9f6968009a78c661242a104c79f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 28 Aug 2024 11:59:51 +0200 Subject: [PATCH 18/53] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 60 +++++++++++++++++++++++++++++++++++++++++++++ tree-sitter.spec | 63 ++---------------------------------------------- 2 files changed, 62 insertions(+), 61 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..acfe157 --- /dev/null +++ b/changelog @@ -0,0 +1,60 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 0.22.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Apr 15 2024 Andreas Schneider - 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 - 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 - 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 - 0.22.1-1 +- Update to version 0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0 + +* Thu Feb 22 2024 Andreas Schneider - 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 - 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 - 0.20.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 04 2023 Andreas Schneider - 0.20.8-1 +- Update to version 0.20.8 + +* Sat Jan 21 2023 Fedora Release Engineering - 0.20.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Sep 03 2022 Andreas Schneider - 0.20.7-1 +- Update to version 0.20.7 + +* Sat Jul 23 2022 Fedora Release Engineering - 0.20.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Apr 04 2022 Andreas Schneider - 0.20.6-1 +- Update to version 0.20.6 + +* Sat Jan 22 2022 Fedora Release Engineering - 0.20.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Dec 01 2021 Andreas Schneider - 0.20.1-1 +- Update to version 0.20.1 + +* Fri Jul 23 2021 Fedora Release Engineering - 0.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 03 2021 Andreas Schneider - 0.20.0-2 +- Fixed libtree-sitter Require of devel package + +* Fri Jul 02 2021 Andreas Schneider - 0.20.0-1 +- Initial package diff --git a/tree-sitter.spec b/tree-sitter.spec index 39f106c..52785cc 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -2,7 +2,7 @@ Name: tree-sitter Version: 0.22.5 -Release: 2%{?dist} +Release: %autorelease Summary: An incremental parsing system for programming tools License: MIT @@ -72,63 +72,4 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 0.22.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Apr 15 2024 Andreas Schneider - 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 - 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 - 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 - 0.22.1-1 -- Update to version 0.22.1 - https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1 - https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0 - -* Thu Feb 22 2024 Andreas Schneider - 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 - 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 - 0.20.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 04 2023 Andreas Schneider - 0.20.8-1 -- Update to version 0.20.8 - -* Sat Jan 21 2023 Fedora Release Engineering - 0.20.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Sep 03 2022 Andreas Schneider - 0.20.7-1 -- Update to version 0.20.7 - -* Sat Jul 23 2022 Fedora Release Engineering - 0.20.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Apr 04 2022 Andreas Schneider - 0.20.6-1 -- Update to version 0.20.6 - -* Sat Jan 22 2022 Fedora Release Engineering - 0.20.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 01 2021 Andreas Schneider - 0.20.1-1 -- Update to version 0.20.1 - -* Fri Jul 23 2021 Fedora Release Engineering - 0.20.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 03 2021 Andreas Schneider - 0.20.0-2 -- Fixed libtree-sitter Require of devel package - -* Fri Jul 02 2021 Andreas Schneider - 0.20.0-1 -- Initial package +%autochangelog From 88fd2b960ea3fbb96b838a7d6c49f578c6d780b2 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 28 Aug 2024 09:45:05 +0200 Subject: [PATCH 19/53] Update to version 0.23.0 - https://github.com/tree-sitter/tree-sitter/blob/v0.23.0/CHANGELOG.md --- .gitignore | 12 +----------- sources | 2 +- tree-sitter.spec | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 8279bc3..df75da3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ -/tree-sitter-0.20.0.tar.gz -/tree-sitter-0.20.1.tar.gz -/tree-sitter-0.20.6.tar.gz -/tree-sitter-0.20.7.tar.gz -/tree-sitter-0.20.8.tar.gz -/tree-sitter-0.20.9.tar.gz -/tree-sitter-0.21.0.tar.gz -/tree-sitter-0.22.1.tar.gz -/tree-sitter-0.22.2.tar.gz -/tree-sitter-0.22.4.tar.gz -/tree-sitter-0.22.5.tar.gz +/tree-sitter-*.tar.gz diff --git a/sources b/sources index 92b70a7..782e8b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.5.tar.gz) = cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c +SHA512 (tree-sitter-0.23.0.tar.gz) = ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9 diff --git a/tree-sitter.spec b/tree-sitter.spec index 52785cc..8d1fe86 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.5 +Version: 0.23.0 Release: %autorelease Summary: An incremental parsing system for programming tools From 849cbabf4d71dab789f4eb1e8b3007d0ae2e161c Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 14 Jan 2025 13:10:57 +0000 Subject: [PATCH 20/53] Update to version 0.24.7 --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 782e8b0..c9ef4c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.23.0.tar.gz) = ab821be564ac7223cc4f9659c08922a78016af9dd3bd69166706fb6a889ac175ba2712a337a1303aceb8f44beaf58640a183e77dddc2c57e35da23079d0cd7b9 +SHA512 (tree-sitter-0.24.7.tar.gz) = 50dff046236b893ba138ec069e0014e20216f19193bc2445bb9afdc3ecafb9769222d5c406fbf34c468b467a7a07d247d95e3c0b8b14687a5c29754f4dc9d503 diff --git a/tree-sitter.spec b/tree-sitter.spec index c438cac..c2c5705 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.23.0 +Version: 0.24.7 Release: %autorelease Summary: An incremental parsing system for programming tools From 4f22cd2f68d406cda6b4158570ed8bf03fb8cc71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:17:18 +0000 Subject: [PATCH 21/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6c2338ae260cc50351d787ac8e5e25c685a4157a Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Thu, 16 Jan 2025 01:12:27 +0000 Subject: [PATCH 22/53] Convenience script to rebuild dependent packages 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. --- .gitignore | 1 + chain-build.sh | 150 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100755 chain-build.sh diff --git a/.gitignore b/.gitignore index df75da3..c06af67 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tree-sitter-*.tar.gz +.side-tag diff --git a/chain-build.sh b/chain-build.sh new file mode 100755 index 0000000..4da868c --- /dev/null +++ b/chain-build.sh @@ -0,0 +1,150 @@ +#!/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` on the rawhide branch. I.e., +# fedpkg switch-branch rawhide +# ... +# fedpkg commit +# fedpkg push +# ./chain-build.sh + +# 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 +set -o xtrace + +# Fail ASAP if unauthenticated: +koji moshimoshi > /dev/null + +# Install potential dependencies: +if [[ ! -f /etc/yum.repos.d/fedora-rawhide.repo \ + || ! -x /usr/bin/crudini \ + || ! -x /usr/bin/jq ]]; then + sudo dnf install -y fedora-repos-rawhide /usr/bin/crudini /usr/bin/jq +fi + +# Get a list of packages that require libtree-sitter: +packages=($( + dnf repoquery \ + --repo=rawhide \ + --whatrequires=libtree-sitter \ + --qf='%{source_name}' \ + | 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 "; 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 wait-repo "$side_tag" +fi + +# Build tree-sitter in the side tag: +fedpkg build --target="$side_tag" + +# Try to bump and rebuild the requiring packages: +verrel="$(fedpkg verrel)" +message="Rebuild against $verrel" +tmp_dir="$(mktemp -td tree-sitter-chain-build.XXXXXX)" +cd "$tmp_dir" +for package in "${packages[@]}"; do + fedpkg clone --branch=rawhide --depth=1 "$package" + cd "$package" + + rpmdev-bumpspec --comment="$message" "$package.spec" + git add "$package.spec" + git commit --allow-empty --message="$message" + + if fedpkg push; then + # Build the requiring package in the side tag: + fedpkg build --target="$side_tag" --no-wait + else + # We lack permission for the requiring package, so submit a pull + # request instead. + + fedpkg fork + + fas_login="$( + git remote -v \ + | grep --perl-regexp --only-matching \ + '^(\w+)(?=\s+ssh://(\1)@pkgs\.fedoraproject\.org/forks/\1/rpms/.+ \(push\)$)' + )" + + git switch --create "$verrel" + git push "$fas_login" "$verrel" + + if [[ ! -f "$tmp_dir/authorization" ]]; then + printf 'Authorization: token ' > "$tmp_dir/authorization" + crudini --get ~/.config/rpkg/fedpkg.conf fedpkg.distgit token \ + >> "$tmp_dir/authorization" + fi + + curl \ + --fail-with-body \ + --header @"$tmp_dir/authorization" \ + --data title="$message" \ + --data branch_to=rawhide \ + --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'\`" \ + "https://src.fedoraproject.org/api/0/rpms/$package/pull-request/new" \ + | jq '.full_url // .' + fi + cd - + rm -rf "$package" +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" + +echo "When all pull requests are merged, and packages built, run: + bodhi updates new --from-tag '$side_tag'" + +# Clean up. +rm -r .side-tag "$tmp_dir" From d1431b43616ee47ec1f43866ee26bf46a27e8987 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 11:54:15 +0000 Subject: [PATCH 23/53] Update to version 0.25.1 --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c9ef4c8..ff607e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.24.7.tar.gz) = 50dff046236b893ba138ec069e0014e20216f19193bc2445bb9afdc3ecafb9769222d5c406fbf34c468b467a7a07d247d95e3c0b8b14687a5c29754f4dc9d503 +SHA512 (tree-sitter-0.25.1.tar.gz) = 9861b18c7209e3c37d180a399bcae181cea46c4e58eff743ff6044ed0f2923ee838fa88993f1266272e07163748d5df1bef7d7dc6d8800e004e8af1227e489af diff --git a/tree-sitter.spec b/tree-sitter.spec index c2c5705..dac619b 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.24.7 +Version: 0.25.1 Release: %autorelease Summary: An incremental parsing system for programming tools From 5230da6e6850cf07000be74226872963c41c2cd2 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 12:08:46 +0000 Subject: [PATCH 24/53] CHANGELOG.md was dropped --- tree-sitter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter.spec b/tree-sitter.spec index dac619b..8f0e36e 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -62,7 +62,7 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %files -n lib%{name} %license LICENSE -%doc README.md CHANGELOG.md +%doc README.md %{_libdir}/libtree-sitter.so.%{treesitter_so_version}* %files -n lib%{name}-devel From e53e01701e3927c321dfd175b725301673637396 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 12:14:05 +0000 Subject: [PATCH 25/53] chain-build.sh: Fix detection of existing side tag. --- chain-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain-build.sh b/chain-build.sh index 4da868c..c60766c 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -65,7 +65,7 @@ packages=($( if [[ -f .side-tag ]]; then side_tag="$(cat .side-tag)" - if fedpkg list-side-tags | grep --quiet --perl-regexp "^$side_tag "; then + 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" From 2b8ebf4abca1ff6ec437a071a26090ee6cc5c6e6 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 12:22:39 +0000 Subject: [PATCH 26/53] chain-build.sh: Fix typo. --- chain-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain-build.sh b/chain-build.sh index c60766c..db27817 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -99,7 +99,7 @@ for package in "${packages[@]}"; do if fedpkg push; then # Build the requiring package in the side tag: - fedpkg build --target="$side_tag" --no-wait + fedpkg build --target="$side_tag" --nowait else # We lack permission for the requiring package, so submit a pull # request instead. From dc60977b7198b6c80255f7a981ec9738e48c668d Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 12:36:47 +0000 Subject: [PATCH 27/53] chain-build.sh: Ensure authorisation file is readable only by user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This shouldn’t matter, because the temporary directory that contains it already has the correct permissions, but it doesn’t hurt to make sure. --- chain-build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index db27817..404c038 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -116,9 +116,12 @@ for package in "${packages[@]}"; do git push "$fas_login" "$verrel" if [[ ! -f "$tmp_dir/authorization" ]]; then - printf 'Authorization: token ' > "$tmp_dir/authorization" - crudini --get ~/.config/rpkg/fedpkg.conf fedpkg.distgit token \ - >> "$tmp_dir/authorization" + ( + umask u=rwx,g=,o= + printf 'Authorization: token ' > "$tmp_dir/authorization" + crudini --get ~/.config/rpkg/fedpkg.conf fedpkg.distgit token \ + >> "$tmp_dir/authorization" + ) fi curl \ From 574e9696af2442332b96946d8a5996a44c31a58d Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 13:14:27 +0000 Subject: [PATCH 28/53] =?UTF-8?q?chain-build.sh:=20Can=E2=80=99t=20push=20?= =?UTF-8?q?from=20a=20shallow=20clone=20if=20fork=20isn=E2=80=99t=20up=20t?= =?UTF-8?q?o=20date.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chain-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/chain-build.sh b/chain-build.sh index 404c038..e1e94b8 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -105,6 +105,7 @@ for package in "${packages[@]}"; do # request instead. fedpkg fork + git fetch --unshallow fas_login="$( git remote -v \ From d42ff33b967bae24bb0155f14bd7a25c6d4b88d9 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 13:17:42 +0000 Subject: [PATCH 29/53] chain-build.sh: Delete .side-tag on completion. --- chain-build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index e1e94b8..0852d8b 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -88,10 +88,9 @@ fedpkg build --target="$side_tag" verrel="$(fedpkg verrel)" message="Rebuild against $verrel" tmp_dir="$(mktemp -td tree-sitter-chain-build.XXXXXX)" -cd "$tmp_dir" for package in "${packages[@]}"; do - fedpkg clone --branch=rawhide --depth=1 "$package" - cd "$package" + fedpkg clone --branch=rawhide --depth=1 "$package" "$tmp_dir/$package" + cd "$tmp_dir/$package" rpmdev-bumpspec --comment="$message" "$package.spec" git add "$package.spec" @@ -139,7 +138,7 @@ for package in "${packages[@]}"; do | jq '.full_url // .' fi cd - - rm -rf "$package" + rm -rf "$tmp_dir/$package" done ## If we had permission to push to all of the repos ourselves, we could From b155b96c209118f76864db603cf18dc0e48c9973 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 13:34:52 +0000 Subject: [PATCH 30/53] chain-build.sh: Link to completed builds in Koji. --- chain-build.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index 0852d8b..f9cf01c 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -146,8 +146,14 @@ done # fedpkg chain-build --target="$side_tag" : $packages # bodhi updates new --from-tag "$@" "$side_tag" -echo "When all pull requests are merged, and packages built, run: - bodhi updates new --from-tag '$side_tag'" +echo "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[*]} + +When all pull requests are merged, and packages built, run: + bodhi updates new --from-tag '$side_tag'" # Clean up. rm -r .side-tag "$tmp_dir" From 36aa4fe28740459a8eb178f1950f90a821657b85 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 19 Feb 2025 12:04:55 +0000 Subject: [PATCH 31/53] Update to version 0.25.2 --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index ff607e2..a4d4f43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.1.tar.gz) = 9861b18c7209e3c37d180a399bcae181cea46c4e58eff743ff6044ed0f2923ee838fa88993f1266272e07163748d5df1bef7d7dc6d8800e004e8af1227e489af +SHA512 (tree-sitter-0.25.2.tar.gz) = 8acdb410c8b5c2552e9dd5524d80ab1d529e418f408d7c495619e6781f3b70ea2d61b6f69b5b3d1ebd753b739c0f9dd744302808d9a3051b5c7dcf68dba30002 diff --git a/tree-sitter.spec b/tree-sitter.spec index 8f0e36e..2fc2c34 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.25.1 +Version: 0.25.2 Release: %autorelease Summary: An incremental parsing system for programming tools From fe8011622a9f401fd02d7151c3b9d7a9f005cafd Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 19 Feb 2025 12:06:05 +0000 Subject: [PATCH 32/53] chain-build.sh: Mention pull request URLs in closing message. --- chain-build.sh | 56 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index f9cf01c..3509b56 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -41,6 +41,14 @@ set -o nounset set -o pipefail set -o xtrace +if (( $# == 1 )); then + typeset -i bug=$1 + shift; +elif (( $# > 1 )); then + echo "usage: $0 [bug-number]" + exit 2 +fi + # Fail ASAP if unauthenticated: koji moshimoshi > /dev/null @@ -124,18 +132,32 @@ for package in "${packages[@]}"; do ) fi - curl \ - --fail-with-body \ - --header @"$tmp_dir/authorization" \ - --data title="$message" \ - --data branch_to=rawhide \ - --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'\`" \ - "https://src.fedoraproject.org/api/0/rpms/$package/pull-request/new" \ - | jq '.full_url // .' + response=$( + curl \ + --fail-with-body \ + --header @"$tmp_dir/authorization" \ + --data title="$message" \ + --data branch_to=rawhide \ + --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 - rm -rf "$tmp_dir/$package" @@ -146,14 +168,18 @@ done # fedpkg chain-build --target="$side_tag" : $packages # bodhi updates new --from-tag "$@" "$side_tag" -echo "Completed builds will appear at: +echo "Tree-sitter and dependent packages are being rebuilt. 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[*]} -When all pull requests are merged, and packages built, run: - bodhi updates new --from-tag '$side_tag'" +${pull_request_urls:+The following pull requests have been created: + ${pull_request_urls[*]} + +}When all ${pull_request_urls:+pull requests are merged, and }packages are built, run: + bodhi updates new --from-tag ${bug:+--bugs=$bug }... '$side_tag'" # Clean up. rm -r .side-tag "$tmp_dir" From dbb37e738aafd86695251a221c907a0315c2a23b Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 19 Feb 2025 12:16:57 +0000 Subject: [PATCH 33/53] chain-build.sh: Post summary to Bugzilla. --- chain-build.sh | 54 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index 3509b56..6ae00a1 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -49,6 +49,32 @@ elif (( $# > 1 )); then exit 2 fi +function create_authorization_header_file { + local type="$1" + local filename="${tmp_dir}/${type}_authorization" + if [[ ! -f "$filename" ]]; then + ( + umask u=rwx,g=,o= + printf 'Authorization: token ' > "$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 @@ -123,19 +149,12 @@ for package in "${packages[@]}"; do git switch --create "$verrel" git push "$fas_login" "$verrel" - if [[ ! -f "$tmp_dir/authorization" ]]; then - ( - umask u=rwx,g=,o= - printf 'Authorization: token ' > "$tmp_dir/authorization" - crudini --get ~/.config/rpkg/fedpkg.conf fedpkg.distgit token \ - >> "$tmp_dir/authorization" - ) - fi + create_authorization_header_file distgit response=$( curl \ --fail-with-body \ - --header @"$tmp_dir/authorization" \ + --header @"$tmp_dir/distgit_authorization" \ --data title="$message" \ --data branch_to=rawhide \ --data branch_from="$verrel" \ @@ -168,7 +187,7 @@ done # fedpkg chain-build --target="$side_tag" : $packages # bodhi updates new --from-tag "$@" "$side_tag" -echo "Tree-sitter and dependent packages are being rebuilt. Completed +summary="Tree-sitter and dependent packages are being rebuilt. Completed builds will appear at: https://koji.fedoraproject.org/koji/builds?inherited=0&tagID=${side_tag##*-} @@ -181,5 +200,20 @@ ${pull_request_urls:+The following pull requests have been created: }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 \ + --fail-with-body \ + --header @"$tmp_dir/bugzilla_authorization" \ + --json "{\"id\": \"$bug\", \"comment\": \"$summary\"}" \ + "https://bugzilla.redhat.com//rest/bug/$bug/comment" +fi + # Clean up. rm -r .side-tag "$tmp_dir" From 2765eae9d472d8c84a9e79f841d4e181663185ff Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 19 Feb 2025 15:20:30 +0000 Subject: [PATCH 34/53] chain-build.sh: Fix posting summary to Bugzilla. --- chain-build.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index 6ae00a1..f96e820 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -52,10 +52,21 @@ 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: token ' > "$filename" + printf 'Authorization: $auth_type ' > "$filename" if ! crudini --get ~/.config/rpkg/fedpkg.conf "fedpkg.$type" token \ >> "$filename" then @@ -187,8 +198,9 @@ done # fedpkg chain-build --target="$side_tag" : $packages # bodhi updates new --from-tag "$@" "$side_tag" -summary="Tree-sitter and dependent packages are being rebuilt. Completed - builds will appear at: +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: @@ -211,8 +223,9 @@ if [[ -n $bug ]]; then curl \ --fail-with-body \ --header @"$tmp_dir/bugzilla_authorization" \ - --json "{\"id\": \"$bug\", \"comment\": \"$summary\"}" \ - "https://bugzilla.redhat.com//rest/bug/$bug/comment" + --variable "summary=$summary" \ + --expand-json "{\"id\": \"$bug\", \"comment\": \"{{summary:json}}\"}" \ + "https://bugzilla.redhat.com/rest/bug/$bug/comment" fi # Clean up. From 0d3aea09ef5b4fdeeaa7c8ba0e0073e4cc637cdf Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Thu, 20 Feb 2025 14:51:25 +0000 Subject: [PATCH 35/53] chain-build.sh: Wait for Tree-sitter to be side tagged before proceeding --- chain-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chain-build.sh b/chain-build.sh index f96e820..494650b 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -127,10 +127,11 @@ if [[ -z ${side_tag:-} ]]; then fi # Build tree-sitter in the side tag: +verrel="$(fedpkg verrel)" fedpkg build --target="$side_tag" +koji wait-repo --build="$verrel" "$sidetag" # Try to bump and rebuild the requiring packages: -verrel="$(fedpkg verrel)" message="Rebuild against $verrel" tmp_dir="$(mktemp -td tree-sitter-chain-build.XXXXXX)" for package in "${packages[@]}"; do From 9a00f1536279ba48b122d684f6545f5febc19176 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 25 Feb 2025 16:14:54 +0000 Subject: [PATCH 36/53] chain-build.sh: Fix quoting of auth token type. --- chain-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain-build.sh b/chain-build.sh index 494650b..c0c180d 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -66,7 +66,7 @@ function create_authorization_header_file { if [[ ! -f "$filename" ]]; then ( umask u=rwx,g=,o= - printf 'Authorization: $auth_type ' > "$filename" + printf 'Authorization: %s ' "$auth_type" > "$filename" if ! crudini --get ~/.config/rpkg/fedpkg.conf "fedpkg.$type" token \ >> "$filename" then From 0f063f62bf5d250fccc26884519bc1efa66cdf4e Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 25 Feb 2025 16:16:16 +0000 Subject: [PATCH 37/53] chain-build.sh: Handle branches other than rawhide. --- chain-build.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index c0c180d..6d91f06 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -4,7 +4,7 @@ # it. Where we have no permission to do the build ourselves, raise a # pull request instead. # -# Run in place of `fedpkg build` on the rawhide branch. I.e., +# Run in place of `fedpkg build`. E.g., # fedpkg switch-branch rawhide # ... # fedpkg commit @@ -90,16 +90,18 @@ function create_authorization_header_file { koji moshimoshi > /dev/null # Install potential dependencies: -if [[ ! -f /etc/yum.repos.d/fedora-rawhide.repo \ - || ! -x /usr/bin/crudini \ +if [[ ! -x /usr/bin/crudini \ || ! -x /usr/bin/jq ]]; then - sudo dnf install -y fedora-repos-rawhide /usr/bin/crudini /usr/bin/jq + sudo dnf 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 repoquery \ - --repo=rawhide \ + --repo=fedora --repo=updates \ + --releasever="${branch#f}" \ --whatrequires=libtree-sitter \ --qf='%{source_name}' \ | grep -v '^tree-sitter$' @@ -135,7 +137,7 @@ koji wait-repo --build="$verrel" "$sidetag" message="Rebuild against $verrel" tmp_dir="$(mktemp -td tree-sitter-chain-build.XXXXXX)" for package in "${packages[@]}"; do - fedpkg clone --branch=rawhide --depth=1 "$package" "$tmp_dir/$package" + fedpkg clone --branch="$branch" --depth=1 "$package" "$tmp_dir/$package" cd "$tmp_dir/$package" rpmdev-bumpspec --comment="$message" "$package.spec" @@ -168,7 +170,7 @@ for package in "${packages[@]}"; do --fail-with-body \ --header @"$tmp_dir/distgit_authorization" \ --data title="$message" \ - --data branch_to=rawhide \ + --data branch_to="$branch" \ --data branch_from="$verrel" \ --data repo_from="$package" \ --data repo_from_username="$fas_login" \ From fb9e77c123426e4add0208c4639b44d36ce5f5d7 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 25 Feb 2025 16:17:13 +0000 Subject: [PATCH 38/53] chain-build.sh: Request repo be regenerated to include fresh treesitter build. --- chain-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain-build.sh b/chain-build.sh index 6d91f06..a657542 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -131,7 +131,7 @@ fi # Build tree-sitter in the side tag: verrel="$(fedpkg verrel)" fedpkg build --target="$side_tag" -koji wait-repo --build="$verrel" "$sidetag" +koji wait-repo --request --build="$verrel" "$side_tag" # Try to bump and rebuild the requiring packages: message="Rebuild against $verrel" From 88cab86eb9e8ef1e23619696db52f96bde51de55 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 11 Mar 2025 22:56:51 +0000 Subject: [PATCH 39/53] Own /usr/share/tree-sitter/queries/ Tree-sitter parsers will start to install .scm files here when their Makefile is generated with tree-sitter-cli 0.25 onwards. --- tree-sitter.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tree-sitter.spec b/tree-sitter.spec index 2fc2c34..6d124b1 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -59,10 +59,14 @@ 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 + %files -n lib%{name} %license LICENSE %doc README.md +%dir %{_datadir}/tree-sitter +%dir %{_datadir}/tree-sitter/queries %{_libdir}/libtree-sitter.so.%{treesitter_so_version}* %files -n lib%{name}-devel From 75d1a38674a4f7a005ebb181b8ce23210c2d9241 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 14 Apr 2025 12:09:24 +0100 Subject: [PATCH 40/53] Update to version 0.25.3. --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a4d4f43..fde337f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.2.tar.gz) = 8acdb410c8b5c2552e9dd5524d80ab1d529e418f408d7c495619e6781f3b70ea2d61b6f69b5b3d1ebd753b739c0f9dd744302808d9a3051b5c7dcf68dba30002 +SHA512 (tree-sitter-0.25.3.tar.gz) = a626dcea5378774511aa1ef669e4dbada3079440b596882172a676c61e53aa6f701b537e3575851af9e10b1e264da25a9f6487b01f43a896cf1a22d58ca7e623 diff --git a/tree-sitter.spec b/tree-sitter.spec index 6d124b1..32140fa 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.25.2 +Version: 0.25.3 Release: %autorelease Summary: An incremental parsing system for programming tools From 749614612143f8c09e35ac185bd0b9ceebe7d2e0 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 12 May 2025 11:49:27 +0100 Subject: [PATCH 41/53] Update to version 0.25.4. --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index fde337f..733c84b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.3.tar.gz) = a626dcea5378774511aa1ef669e4dbada3079440b596882172a676c61e53aa6f701b537e3575851af9e10b1e264da25a9f6487b01f43a896cf1a22d58ca7e623 +SHA512 (tree-sitter-0.25.4.tar.gz) = 87c65518c72d82ca43b374e4bc062847a4110f8c6415dcc5d07f3d16ad38cec768b276c9bcd3815e663ee775ee777fb6103ad5d41f2c740042a03cdc20e025f4 diff --git a/tree-sitter.spec b/tree-sitter.spec index 32140fa..2908f4f 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.25.3 +Version: 0.25.4 Release: %autorelease Summary: An incremental parsing system for programming tools From 8a1208563c6920483acfcd5d63c3b0e1fd56e624 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 12 May 2025 13:39:14 +0100 Subject: [PATCH 42/53] =?UTF-8?q?chain-build.sh:=20In=20Fedora=2042,=20`dn?= =?UTF-8?q?f=20repoquery=20--qf=3D=E2=80=A6`=20lacks=20implicit=20newline.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chain-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain-build.sh b/chain-build.sh index a657542..42d3136 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -103,7 +103,7 @@ packages=($( --repo=fedora --repo=updates \ --releasever="${branch#f}" \ --whatrequires=libtree-sitter \ - --qf='%{source_name}' \ + --qf='%{source_name}\n' \ | grep -v '^tree-sitter$' )) From 4e8c9e31bddcd8e4de2951aaf954633a5d03fb3d Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 12 May 2025 13:44:17 +0100 Subject: [PATCH 43/53] chain-build.sh: Skip rebuilds depending on libtree-sitter only for dirs. --- chain-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chain-build.sh b/chain-build.sh index 42d3136..acf7fa9 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -102,7 +102,7 @@ packages=($( dnf repoquery \ --repo=fedora --repo=updates \ --releasever="${branch#f}" \ - --whatrequires=libtree-sitter \ + --whatrequires='libtree-sitter.so.*' \ --qf='%{source_name}\n' \ | grep -v '^tree-sitter$' )) From 387042882b13a3d238b68df484fd404d792d4899 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 12 May 2025 14:33:55 +0100 Subject: [PATCH 44/53] chain-build.sh: Prevent error `line 220: bug: unbound variable`. --- chain-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index acf7fa9..240de50 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -9,7 +9,7 @@ # ... # fedpkg commit # fedpkg push -# ./chain-build.sh +# ./chain-build.sh # MIT License # @@ -217,7 +217,7 @@ ${pull_request_urls:+The following pull requests have been created: echo "$summary" -if [[ -n $bug ]]; then +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. From 8216ed25899c92b3b87a667dad37030a030f97a4 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 28 May 2025 12:45:51 +0100 Subject: [PATCH 45/53] Update to version 0.25.5. --- chain-build.sh | 55 +++++++++++++++++++++++++++++++++--------------- sources | 2 +- tree-sitter.spec | 2 +- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index 240de50..d662a21 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -39,14 +39,34 @@ set -o errexit set -o nounset set -o pipefail -set -o xtrace + +function usage { + echo "usage: $BASH_ARGV0 [-d] [-v] [bug-number]" + exit 2 +} + +quiet=-q +while getopts 'dv' OPT; do + case "$OPT" in + d) + set -o xtrace + quiet= + ;; + v) + quiet= + ;; + *) + usage + ;; + esac +done +shift $((OPTIND - 1)) if (( $# == 1 )); then typeset -i bug=$1 shift; elif (( $# > 1 )); then - echo "usage: $0 [bug-number]" - exit 2 + usage fi function create_authorization_header_file { @@ -92,14 +112,14 @@ koji moshimoshi > /dev/null # Install potential dependencies: if [[ ! -x /usr/bin/crudini \ || ! -x /usr/bin/jq ]]; then - sudo dnf install -y /usr/bin/crudini /usr/bin/jq + 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 repoquery \ + dnf $quiet repoquery \ --repo=fedora --repo=updates \ --releasever="${branch#f}" \ --whatrequires='libtree-sitter.so.*' \ @@ -125,34 +145,35 @@ if [[ -z ${side_tag:-} ]]; then | grep --perl-regexp --only-matching "(?<=^Side tag ').*(?=')" )" echo "$side_tag" > .side-tag - koji wait-repo "$side_tag" + koji $quiet wait-repo "$side_tag" fi # Build tree-sitter in the side tag: verrel="$(fedpkg verrel)" -fedpkg build --target="$side_tag" -koji wait-repo --request --build="$verrel" "$side_tag" +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)" for package in "${packages[@]}"; do - fedpkg clone --branch="$branch" --depth=1 "$package" "$tmp_dir/$package" + fedpkg $quiet clone --branch="$branch" --depth=1 "$package" \ + "$tmp_dir/$package" cd "$tmp_dir/$package" - rpmdev-bumpspec --comment="$message" "$package.spec" + rpmdev-bumpspec --comment="$message" "$package.spec" >/dev/null git add "$package.spec" git commit --allow-empty --message="$message" - if fedpkg push; then + if fedpkg $quiet push; then # Build the requiring package in the side tag: - fedpkg build --target="$side_tag" --nowait + fedpkg $quiet build --target="$side_tag" --nowait else # We lack permission for the requiring package, so submit a pull # request instead. - fedpkg fork - git fetch --unshallow + fedpkg $quiet fork + git fetch $quiet --unshallow fas_login="$( git remote -v \ @@ -160,8 +181,8 @@ for package in "${packages[@]}"; do '^(\w+)(?=\s+ssh://(\1)@pkgs\.fedoraproject\.org/forks/\1/rpms/.+ \(push\)$)' )" - git switch --create "$verrel" - git push "$fas_login" "$verrel" + git switch $quiet --create "$verrel" + git push $quiet "$fas_login" "$verrel" create_authorization_header_file distgit @@ -192,7 +213,7 @@ Relates to https://bugzilla.redhat.com/show_bug.cgi?id=$bug. pull_request_urls+=("$response") fi fi - cd - + cd - >/dev/null rm -rf "$tmp_dir/$package" done diff --git a/sources b/sources index 733c84b..8db2d32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.4.tar.gz) = 87c65518c72d82ca43b374e4bc062847a4110f8c6415dcc5d07f3d16ad38cec768b276c9bcd3815e663ee775ee777fb6103ad5d41f2c740042a03cdc20e025f4 +SHA512 (tree-sitter-0.25.5.tar.gz) = c9b819e720a7f1ded294fd007cc735be3fb65fe1fb0720a79d5186d3600df938e0a286358bcfbc732d8de0ec09a9ca6985e0a02c4445b9f67866121e43bfe43d diff --git a/tree-sitter.spec b/tree-sitter.spec index 2908f4f..8a3ac7e 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.25.4 +Version: 0.25.5 Release: %autorelease Summary: An incremental parsing system for programming tools From 42677089297d39128069599e958fe45b01db73aa Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 28 May 2025 14:06:35 +0100 Subject: [PATCH 46/53] chain-build.sh: Be more quiet. --- chain-build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/chain-build.sh b/chain-build.sh index d662a21..8e10052 100755 --- a/chain-build.sh +++ b/chain-build.sh @@ -145,7 +145,7 @@ if [[ -z ${side_tag:-} ]]; then | grep --perl-regexp --only-matching "(?<=^Side tag ').*(?=')" )" echo "$side_tag" > .side-tag - koji $quiet wait-repo "$side_tag" + koji $quiet wait-repo --no-request "$side_tag" fi # Build tree-sitter in the side tag: @@ -188,6 +188,7 @@ for package in "${packages[@]}"; do response=$( curl \ + ${quiet:+--silent --show-error} \ --fail-with-body \ --header @"$tmp_dir/distgit_authorization" \ --data title="$message" \ @@ -236,7 +237,9 @@ ${pull_request_urls:+The following pull requests have been created: }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" +echo " + +$summary" if [[ -n ${bug:-} ]]; then # We could probably use Kerberos here, but @@ -245,6 +248,8 @@ if [[ -n ${bug:-} ]]; then 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" \ From 3c1e6f26b3ab7886ff34667d191230f800206476 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Fri, 13 Jun 2025 15:13:17 +0100 Subject: [PATCH 47/53] Virtual Provides for compatible language ABI versions These are of the form `Provides: tree-sitter(:LANGUAGE_VERSION) = n`, where n is in the range given in `lib/include/tree_sitter/api.h`. Parsers can Require the ABI version they use (and this will happen automatically starting with tree-sitter-srpm-macros 0.4.0). --- tree-sitter.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tree-sitter.spec b/tree-sitter.spec index 8a3ac7e..1151417 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,4 +1,9 @@ -%global treesitter_so_version 0 +%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.5 @@ -28,6 +33,12 @@ 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 @@ -62,12 +73,19 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p 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.%{treesitter_so_version}* +%{_libdir}/libtree-sitter.so.%{tree_sitter_so_version}* %files -n lib%{name}-devel %{_includedir}/tree_sitter From dd0aed24fe54d72fa6406ca273e35a8662a5875b Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Fri, 13 Jun 2025 15:19:13 +0100 Subject: [PATCH 48/53] Update to version 0.25.6. --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8db2d32..d2125ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.5.tar.gz) = c9b819e720a7f1ded294fd007cc735be3fb65fe1fb0720a79d5186d3600df938e0a286358bcfbc732d8de0ec09a9ca6985e0a02c4445b9f67866121e43bfe43d +SHA512 (tree-sitter-0.25.6.tar.gz) = 47213b68233d376e145e3f42b4674d64e7ff27436f4a028e751d9ad8494469ff67b002ce184346d3f6848df2c91386c28127827c43a8bea34da5e84f2530f02f diff --git a/tree-sitter.spec b/tree-sitter.spec index 1151417..7f6679a 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -6,7 +6,7 @@ Name: tree-sitter -Version: 0.25.5 +Version: 0.25.6 Release: %autorelease Summary: An incremental parsing system for programming tools From 4a6599c05136eff0b1e72e138c739d04bef52e40 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Fri, 18 Jul 2025 12:24:57 +0100 Subject: [PATCH 49/53] Update to version 0.25.8. --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d2125ca..491ac4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.6.tar.gz) = 47213b68233d376e145e3f42b4674d64e7ff27436f4a028e751d9ad8494469ff67b002ce184346d3f6848df2c91386c28127827c43a8bea34da5e84f2530f02f +SHA512 (tree-sitter-0.25.8.tar.gz) = 0d26d0699f61fa27b5adbc298ff53f8e0f5b9f2f1b216744200f6f50cff777c9c5a5a5b92304a4d1889fccd9d8a6dd6b7d4947bac907a91850322281f754ea53 diff --git a/tree-sitter.spec b/tree-sitter.spec index 7f6679a..f843f61 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -6,7 +6,7 @@ Name: tree-sitter -Version: 0.25.6 +Version: 0.25.8 Release: %autorelease Summary: An incremental parsing system for programming tools From 1d830d78ab6e8c123692648214a8335c4c2fe328 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:31:41 +0000 Subject: [PATCH 50/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From bad755410aa4595a136a1598e830d72b9018676f Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Fri, 18 Jul 2025 12:55:46 +0100 Subject: [PATCH 51/53] chain-build.sh: Add an option to skip raising pull requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `rizin` package maintainers aren’t interested in rebuilding for every `tree-sitter` update (most of which don’t actually contain unannounced ABI changes). --- chain-build.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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'" From 7d52cc93f75d6fbf2417a454c08ad1b319cce6a0 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 9 Sep 2025 14:15:07 +0100 Subject: [PATCH 52/53] Update to version 0.25.9. --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 491ac4d..8eb3e9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.8.tar.gz) = 0d26d0699f61fa27b5adbc298ff53f8e0f5b9f2f1b216744200f6f50cff777c9c5a5a5b92304a4d1889fccd9d8a6dd6b7d4947bac907a91850322281f754ea53 +SHA512 (tree-sitter-0.25.9.tar.gz) = c927274081bc61abde68399b0c7736cd2b0a5f96c79d1147fe85fc30cf48238afcff112cb61a5c89f3c3ccb3a5f154e4ac8935c1d423c63e93f814eb034ec50b diff --git a/tree-sitter.spec b/tree-sitter.spec index f843f61..b19bbf4 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -6,7 +6,7 @@ Name: tree-sitter -Version: 0.25.8 +Version: 0.25.9 Release: %autorelease Summary: An incremental parsing system for programming tools From dea6219cb49b26e71e999c63da0bfce1680253e8 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 24 Sep 2025 14:41:24 +0100 Subject: [PATCH 53/53] Update to version 0.25.10. --- sources | 2 +- tree-sitter.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8eb3e9b..9599e8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.25.9.tar.gz) = c927274081bc61abde68399b0c7736cd2b0a5f96c79d1147fe85fc30cf48238afcff112cb61a5c89f3c3ccb3a5f154e4ac8935c1d423c63e93f814eb034ec50b +SHA512 (tree-sitter-0.25.10.tar.gz) = f0465a2fabe303c1b62f1f55ed08aa57372ac11370d229adcccd99b5e8067be53e92da281cdfbcd034e2ecefb33ac90a119eeac9035670ac8fbaa4242cb87a11 diff --git a/tree-sitter.spec b/tree-sitter.spec index b19bbf4..19fac45 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -6,7 +6,7 @@ Name: tree-sitter -Version: 0.25.9 +Version: 0.25.10 Release: %autorelease Summary: An incremental parsing system for programming tools