Skip to content

Commit ce460e1

Browse files
authored
[AURON #2439] Add git to yum install (#2442)
# Which issue does this PR close? Closes #2439 # Rationale for this change https://github.com/apache/auron/actions/runs/30325123247/job/90213501717 ``` build-release-1 | [ERROR] [mvn-builder-auron-core] ./dev/vendors/setup-vendors.sh: line 135: git: command not found ``` # What changes are included in this PR? 1. `dev/docker-build/centos7/Dockerfile`: install `git` alongside the other build tools (it was previously missing entirely, causing `setup-vendors.sh` to fail with `git: command not found`). 2. `dev/vendors/setup-vendors.sh`: replace `git -C "${target_dir}" apply --3way "${patch}"` with `(cd "${target_dir}" && git apply --3way "${patch}")`, so patch application no longer depends on a git version >= 1.8.5. 3. `.github/workflows/build-amd64-releases.yml`: add `dev/docker-build/centos7/Dockerfile` to the `paths` trigger list so changes to the build image are validated by this workflow on PRs. # Are there any user-facing changes? No # How was this patch tested? GHA # Was this patch authored or co-authored using generative AI tooling? - [ ] Yes - [ ] No
1 parent 18f9b3f commit ce460e1

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/build-amd64-releases.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ on:
3030
paths:
3131
- '.github/workflows/build-amd64-releases.yml'
3232
- 'auron-build.sh'
33+
- 'dev/docker-build/centos7/Dockerfile'
3334

3435
jobs:
3536
build-snapshot:

dev/docker-build/centos7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN sed -i "s/^mirrorlist/#mirrorlist/g" /etc/yum.repos.d/*.repo
3030
RUN sed -i "s|^metalink=|#metalink=|g" /etc/yum.repos.d/epel.repo
3131
RUN sed -i "s|https://download.fedoraproject.org/pub/epel|https://archives.fedoraproject.org/pub/archive/epel|g" /etc/yum.repos.d/epel.repo
3232
RUN yum clean all && yum makecache
33-
RUN yum install -y libzip unzip openssl-devel
33+
RUN yum install -y libzip unzip openssl-devel git
3434

3535
# install gcc-11
3636
RUN yum install -y devtoolset-11-gcc devtoolset-11-gcc-c++

dev/vendors/setup-vendors.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ apply_patches() {
9595
for patch in "${patches[@]}"; do
9696
i=$((i + 1))
9797
echo " [${i}/${#patches[@]}] $(basename "${patch}")"
98-
git -C "${target_dir}" apply --3way "${patch}"
98+
(cd "${target_dir}" && git apply --3way "${patch}")
9999
done
100100
}
101101

0 commit comments

Comments
 (0)