PR#32: Merge branch 'upstream-snapshot' into rawhide - rpms/python-lit

rpms / python-lit

#32 Merge branch 'upstream-snapshot' into rawhide

Merged 8 months ago by tuliom. Opened 9 months ago by tuliom.

rpms/ tuliom/python-lit merge-upstream-snapshot into rawhide

Update to LLVM 17.0.0 RC1

Tulio Magno Quites Machado Filho • 8 months ago

aed0df2

.copr/Makefile

file added

+17

		`@@ -0,0 +1,17 @@`
		`+ # See https://docs.pagure.org/copr.copr/user_documentation.html#make-srpm`
		`+ # See for the --setopt option in the enabling of copr repo see:`
		`+ # https://pagure.io/copr/copr/issue/184`
		`+`
		`+ COPR_USERNAME=$(shell rpm --eval %copr_username)`
		`+ COPR_PROJECT=$(shell rpm --eval %copr_projectname)`
		`+`
		`+ .PHONY: srpm`
		`+ srpm:`
		`+ dnf install -y dnf-plugins-core fedora-packager`
		`+ dnf copr enable -y --setopt=reposdir=/tmp/yum.repos.d $(COPR_USERNAME)/$(COPR_PROJECT)`
		`+ dnf install -y --setopt=reposdir=/tmp/yum.repos.d llvm-snapshot-builder`
		`+ rpmbuild \`
		`+ --define "_srcrpmdir $(outdir)" \`
		`+ --define "_sourcedir $(shell pwd)" \`
		`+ --define "_disable_source_fetch 0" \`
		`+ -bs $(spec)`

D149746.diff

file removed

-13

		`@@ -1,13 +0,0 @@`
		`- diff --git a/llvm/utils/lit/lit/llvm/config.py b/llvm/utils/lit/lit/llvm/config.py`
		`- --- a/llvm/utils/lit/lit/llvm/config.py`
		`- +++ b/llvm/utils/lit/lit/llvm/config.py`
		`- @@ -144,6 +144,8 @@`
		`- features.add('target-aarch64')`
		`- elif re.match(r'^arm.*', target_triple):`
		`- features.add('target-arm')`
		`- + if re.match(r'^ppc64le.*-linux', target_triple):`
		`- + features.add('target=powerpc64le-linux')`
		`-`
		`- use_gmalloc = lit_config.params.get('use_gmalloc', None)`
		`- if lit.util.pythonize_bool(use_gmalloc):`
		`-`

python-lit.spec

file modified

+35 -10

		`@@ -1,22 +1,39 @@`
		`- %global lit_version 16.0.6`
		`- #global rc_ver 4`
		`+ %bcond_with snapshot_build`
		`+`
		`+ %if %{with snapshot_build}`
		`+ # Unlock LLVM Snapshot LUA functions`
		`+ %{llvm_sb_verbose}`
		`+ %{llvm_sb}`
		`+ %endif`
		`+`
		`+ %global lit_version 17.0.0`
		`+ %global rc_ver 1`
		`#global post_ver 0`

		`+ %global python_lit_srcdir %{srcname}-%{version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}}`
		`+`
		`+ %if %{with snapshot_build}`
		`+ %undefine rc_ver`
		`+ %global lit_version %{llvm_snapshot_version}`
		`+ %global python_lit_srcdir llvm-%{lit_version}.src/utils/lit`
		`+ %endif`
		`+`
		`%bcond_without check`

		`Name: python-lit`
		`- Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}}`
		`- Release: 3%{?dist}`
		`+ Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}`
		`+ Release: 1%{?dist}`
		`BuildArch: noarch`

		`License: NCSA`
		`Summary: Tool for executing llvm test suites`
		`URL: https://pypi.python.org/pypi/lit`
		`+ %if %{without snapshot_build}`
		`Source0: %{pypi_source lit %{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}}}`
		`- # Remove the license file if it gets included in the tarball again.`
		`- Source1: https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{lit_version}%{?rc_ver:rc%{rc_ver}}/llvm/utils/lit/LICENSE.TXT`
		`-`
		`- Patch0: D149746.diff`
		`+ %else`
		`+ Source0: %{llvm_snapshot_source_prefix}llvm-%{llvm_snapshot_yyyymmdd}.src.tar.xz`
		`+ %{llvm_snapshot_extra_source_tags}`
		`+ %endif`

		`# for file check`
		`%if %{with check}`
		`@@ -38,8 +55,11 @@`
		`lit is a tool used by the LLVM project for executing its test suites.`

		`%prep`
		`+ %if %{with snapshot_build}`
		`+ %autosetup -n %{python_lit_srcdir} -p4`
		`+ %else`
		`%autosetup -n lit-%{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}} -p4`
		`- cp %{SOURCE1} ./`
		`+ %endif`

		`%build`
		`%py3_build`
		`@@ -50,7 +70,7 @@`
		`# Strip out #!/usr/bin/env python`
		`sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/lit/*.py`

		`- %if %{with check}`
		`+ %if %{with check} && %{without snapshot_build}`
		`%check`
		`%{__python3} lit.py -v tests`
		`%endif`
		`@@ -62,6 +82,11 @@`
		`%{_bindir}/lit`

		`%changelog`
		`+ %{?llvm_snapshot_changelog_entry}`
		`+`
		`+ * Mon Jul 31 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.0~rc1-1`
		`+ - Update to LLVM 17.0.0 RC1`
		`+`
		`* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.6-3`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild`

sources

file modified

+1 -2

		`@@ -1,2 +1,1 @@`
		`- SHA512 (lit-16.0.6.tar.gz) = 994140c36aa8140fc28e41f47f9cb8fff0a9e6caa43ccb19e1d7b93f01a2c77b007bd85bb44ca29c47432abf3151845f2e1c5883b6f410109702bae0f975f773`
		`- SHA512 (LICENSE.TXT) = 4a3325224ec2c86de08cf6f9320f1c95a6de061e45b53841df8fcab755d77341c27e0e064e4330d096b413c4fbb5310362b2f6c9b5c60e907bdceb2ff9b956d0`
		`+ SHA512 (lit-17.0.0rc1.tar.gz) = d23ba5ea9c7125bab3fbf87072589c9e26ee1097170eba072845cf3f006dc47ad051011ad75a9acd3251a9a70824fc2d43608557d3e4d4bbd7a011b14dc6fe79`

no initial comment

tuliom commented 9 months ago

Is it safe to create merge commits using the merge button of the web ui?
Or do we have to push it manually?

zuul commented 9 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/9fc42b8eae9d4907b1cfb00ea3630cba

check-for-arches : SUCCESS in 2m 44s
check-for-eln : SUCCESS in 20s
eln-rpm-scratch-build : SUCCESS in 9m 59s
rpm-scratch-build : SUCCESS in 12m 49s
rpm-linter : SUCCESS in 3m 55s (non-voting)
rpm-rpminspect : FAILURE in 4m 21s (non-voting)
check-for-sti-tests : SUCCESS in 16s
check-for-fmf-tests : SUCCESS in 16s
rpm-install-test : FAILURE in 36s
rpm-tmt-test : FAILURE in 5m 29s
Skipped 5 jobs

rebased onto fb91585572d9b76a1ad51d64d37427d447b90d55

9 months ago

zuul commented 9 months ago

check-for-arches : SUCCESS in 2m 03s
check-for-eln : SUCCESS in 19s
eln-rpm-scratch-build : SUCCESS in 14m 27s
rpm-scratch-build : SUCCESS in 13m 52s
rpm-linter : SUCCESS in 5m 19s (non-voting)
rpm-rpminspect : SUCCESS in 7m 27s (non-voting)
check-for-sti-tests : SUCCESS in 19s
check-for-fmf-tests : SUCCESS in 18s
rpm-install-test : SUCCESS in 3m 37s
rpm-tmt-test : FAILURE in 4m 59s
Skipped 5 jobs

rebased onto ed86957

8 months ago

tuliom commented 8 months ago

I modified this PR in order to integrate the suggestions from https://src.fedoraproject.org/rpms/llvm/pull-request/177

This is now a squashed merge commit that updates the source code to LLVM 17.0.0 RC1.
A squashed merge commit does not leave any trace from the upstream-snapshot except for the commit message.

zuul commented 8 months ago