Skip to content

dev: Update .gitattributes for Nouveau#5862

Draft
big-r81 wants to merge 1 commit intomainfrom
dev/update-git-attributes-for-nouveau
Draft

dev: Update .gitattributes for Nouveau#5862
big-r81 wants to merge 1 commit intomainfrom
dev/update-git-attributes-for-nouveau

Conversation

@big-r81
Copy link
Contributor

@big-r81 big-r81 commented Jan 24, 2026

After moving Nouveau from nouveau to extra/nouveau we need to update the .gitattributes file, that Windows will use LF as line ending, when no core.autocrlf is configured within git.

@nickva
Copy link
Contributor

nickva commented Jan 24, 2026

Noticed a centos failure

15:16:21  export HOME=/home/jenkins/workspace/jenkins-cm1_PullRequests_PR-5862/centos8 && cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define '_version 3.5.1.5b14cc6-dirty'
15:16:21  error: line 20: Illegal char '-' (0x2d) in: Version:       3.5.1.5b14cc6-dirty
15:16:21  make[1]: *** [Makefile:302: build-rpm] Error 1
15:16:21  make[1]: Leaving directory '/home/jenkins/workspace/jenkins-cm1_PullRequests_PR-5862/centos8/couchdb-pkg'

@big-r81
Copy link
Contributor Author

big-r81 commented Jan 24, 2026

We had this failure some time ago with this illegal character. I thought it was fixed… Have to do a rebase and we will see what happens.

@big-r81 big-r81 force-pushed the dev/update-git-attributes-for-nouveau branch from 8a75f2a to a9a8809 Compare January 24, 2026 22:10
@nickva
Copy link
Contributor

nickva commented Jan 25, 2026

Interesting, does it pass without this commit? In other words wondering if it's something here we did with git or it just an issue with the package repo. I can't remember how we fixed this before either.

@big-r81 big-r81 marked this pull request as draft January 25, 2026 09:02
@big-r81
Copy link
Contributor Author

big-r81 commented Jan 25, 2026

Mhhh, it fails here:

from Makefile:

	export HOME=$(HOME) && cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define '_version $(VERSION)'

and then in couchdb.spec:

Version:       %{_version}

But I don't know why this is related to this commit?

Other question:

Version:       %{_version}
Release:       1%{?dist}
Source:        https://www.apache.org/dist/couchdb/source/${version}/apache-couchdb-%{version}.tar.gz

We have version with and without underscore. Is this intentional?

@big-r81
Copy link
Contributor Author

big-r81 commented Jan 25, 2026

Oh found this, we had this problem already, but the PR is closed: apache/couchdb-pkg#196

@big-r81
Copy link
Contributor Author

big-r81 commented Jan 25, 2026

looked at an successful run on main, there was no -dirty string in the version, but why?
main:

20:27:16  export HOME=/home/jenkins/workspace/kins-cm1_FullPlatformMatrix_main/centos8 && cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define '_version 3.5.1.52ef21c'

or a successful PR:

14:31:35  export HOME=/home/jenkins/workspace/jenkins-cm1_PullRequests_PR-5863/centos8 && cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define '_version 3.5.1.3c00854'

@nickva
Copy link
Contributor

nickva commented Jan 26, 2026

looked at an successful run on main, there was no -dirty string in the version, but why?

Usually it's because we leave something in the source tree that's not expected (we make changes to it outside of git). So in that respect this PR can affect that since it deals with git attributes and ignores. But I am not entirely sure how yet.

After moving Nouveau from `nouveau` to `extra/nouveau` we
need to update the `.gitattributes` file, that Windows will
use LF as line ending, when no `core.autocrlf` is
configured within git.
@big-r81 big-r81 force-pushed the dev/update-git-attributes-for-nouveau branch from a9a8809 to 867a833 Compare February 7, 2026 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants