Merged
Conversation
Removed all the files that were duplicated on lfs_dockers repo Re-routed the transport of pgp keys using the newer more correct gpg_agent docker image Added some logic to work with mingw32 too
Added Requires back in
Contributor
|
Looks good 👍 Thanks for the patch! |
chrisd8088
added a commit
to chrisd8088/git-lfs
that referenced
this pull request
Dec 27, 2022
In commit cd3e92e of PR git-lfs#480 we introduced support for CentOS 6 into our rpm/build_rpms.bsh script by building an early version of Git from a local git.spec file. Then in commit d2d90a8 of PR git-lfs#891 this was replaced with installation from the setup.ius.io service. In commit git-lfs/build-dockers@7af5552 of PR git-lfs/build-dockers#19, however, the download and installation of Git 2.16 from github.com was added to the CentOS 6 Dockerfile; later this was adjusted to download from kernel.org. In commit git-lfs/build-dockers@f1f573f of PR git-lfs/build-dockers#29 we added support for CentOS 8, which supports a direct installation of Git using yum. And in commit git-lfs/build-dockers@898d9b0 of PR git-lfs/build-dockers#33 we dropped support for CentOS 6 entirely. Therefore we no longer have any need for our rpm/build_rpms.bsh script to install Git at all, especially not very old versions, so we simply remove that logic from our script.
chrisd8088
added a commit
to chrisd8088/git-lfs
that referenced
this pull request
Dec 27, 2022
In commit cd3e92e of PR git-lfs#480 we introduced support for CentOS 6 into our rpm/build_rpms.bsh script by building an early version of Git from a local git.spec file. Then in commit d2d90a8 of PR git-lfs#891 this was replaced with installation from the setup.ius.io service. In commit git-lfs/build-dockers@7af5552 of PR git-lfs/build-dockers#19, however, the download and installation of Git 2.16 from github.com was added to the CentOS 6 Dockerfile; later this was adjusted to download from kernel.org. In commit git-lfs/build-dockers@f1f573f of PR git-lfs/build-dockers#29 we added support for CentOS 8, which supports a direct installation of Git using yum. And in commit git-lfs/build-dockers@898d9b0 of PR git-lfs/build-dockers#33 we dropped support for CentOS 6 entirely. Therefore we no longer have any need for our rpm/build_rpms.bsh script to install Git at all, especially not very old versions, so we simply remove that logic from our script.
chrisd8088
added a commit
to chrisd8088/git-lfs
that referenced
this pull request
Dec 28, 2022
In commit cd3e92e of PR git-lfs#480 we introduced support for CentOS 6 into our rpm/build_rpms.bsh script by building an early version of Git from a local git.spec file. Then in commit d2d90a8 of PR git-lfs#891 this was replaced with installation from the setup.ius.io service. In commit git-lfs/build-dockers@7af5552 of PR git-lfs/build-dockers#19, however, the download and installation of Git 2.16 from github.com was added to the CentOS 6 Dockerfile; later this was adjusted to download from kernel.org. In commit git-lfs/build-dockers@f1f573f of PR git-lfs/build-dockers#29 we added support for CentOS 8, which supports a direct installation of Git using yum. And in commit git-lfs/build-dockers@898d9b0 of PR git-lfs/build-dockers#33 we dropped support for CentOS 6 entirely. Therefore we no longer have any need for our rpm/build_rpms.bsh script to install Git at all, especially not very old versions, so we simply remove that logic from our script.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added require for git back into rpm
-Moved Centos 6 build/tests to use IUS for a more official-ish git rpm. Removed our own git.spec file, as discussed in #878
-Change docker images to auto build images, which resulted in a slight name change. The old images will be taken down at a later time
-Got tests working again with new auto builds. They were a low priority, so they were purposefully left behind. But with discussion like #871, I wanted to make sure this was working again. It still doesn't work against package cloud keys yet, but since packagecloud doesn't sign rpms, it would appear there's no point there
-Cleaned up all files duplicated in the git-lfs_dockers repo.
-Updated README
-Since the dockerfiles are no longer in the docker directory, changed the run_dockers script to go by name (i.e.
debian_7instead of filenamegit-lfs_debian_7.dockerfile, since there was no purpose behind the longer version)