Commit ce460e1
authored
# 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
- dev
- docker-build/centos7
- vendors
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
| 98 | + | |
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| |||
0 commit comments