Skip to content

Commit

Permalink
Remove additional version of Git from build containers
Browse files Browse the repository at this point in the history
This was originally needed because the default git did not support the `GIT_*`
environment variables used by the CI.

With alisw/alibuild#835 and
alisw/ali-bot#1298, this is not needed anymore, so we
can stop installing the extra copy of Git.
  • Loading branch information
TimoWilken committed Mar 6, 2024
1 parent 4086f7c commit 3f65e41
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
10 changes: 0 additions & 10 deletions slc7-builder/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,3 @@ which work_queue_worker
curl -Lo /tmp/vault.zip https://releases.hashicorp.com/vault/0.5.0/vault_0.5.0_linux_amd64.zip
unzip /tmp/vault.zip vault -d /usr/bin/
rm -v /tmp/vault.zip

# A recent git version (>= 2.31.0) is required for specifying git config
# using environment variables.
curl -L "https://mirrors.edge.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.xz" | tar -xJC /tmp
cd "/tmp/git-$GIT_VERSION"
make prefix=/usr/local -j 10 all
make prefix=/usr/local install
cd /
rm -rf "/tmp/git-$GIT_VERSION"
[ "$(git --version)" = "git version $GIT_VERSION" ]
10 changes: 0 additions & 10 deletions slc8-builder/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,3 @@ gem install --no-document fpm
curl -Lo /tmp/vault.zip https://releases.hashicorp.com/vault/0.5.0/vault_0.5.0_linux_amd64.zip
unzip /tmp/vault.zip vault -d /usr/bin/
rm -v /tmp/vault.zip

# A recent git version (>= 2.31.0) is required for specifying git config
# using environment variables.
curl -L "https://mirrors.edge.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.xz" | tar -xJC /tmp
cd "/tmp/git-$GIT_VERSION"
make prefix=/usr/local -j 10 all
make prefix=/usr/local install
cd /
rm -rf "/tmp/git-$GIT_VERSION"
[ "$(git --version)" = "git version $GIT_VERSION" ]

0 comments on commit 3f65e41

Please sign in to comment.