Skip to content

Commit 6226915

Browse files
committed
fix(ci): build glibc217 in manylinux2014 job container
Replace docker run on ubuntu-22.04 with job-level container quay.io/pypa/manylinux2014_x86_64 and checkout@v4, matching PyPA manylinux CI style.
1 parent 776f65a commit 6226915

2 files changed

Lines changed: 8 additions & 16 deletions

File tree

.github/scripts/package-client-cpp-centos7.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
# Build client-cpp inside CentOS 7 + devtoolset-8 for glibc 2.17-compatible .so.
17+
# Build client-cpp on manylinux2014 (CentOS 7, glibc 2.17 baseline) with devtoolset-8.
1818
set -euxo pipefail
1919

2020
# CentOS 7 EOL: redirect yum repos to vault.centos.org (see CentOS wiki / SIG SCLo).

.github/workflows/client-cpp-package.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,13 @@ jobs:
159159
name: Package (linux-x86_64-glibc217)
160160
needs: [should-package, resolve-matrix]
161161
if: needs.should-package.outputs.run == 'true' && needs.resolve-matrix.outputs.run_linux == 'true'
162-
# No job container: checkout uses Node 24 (needs glibc 2.27+); build runs in CentOS 7 via docker.
163-
runs-on: ubuntu-22.04
162+
runs-on: ubuntu-latest
163+
container:
164+
image: quay.io/pypa/manylinux2014_x86_64
164165
steps:
165-
- uses: actions/checkout@v5
166+
- uses: actions/checkout@v4
166167
- name: Cache Maven packages
167-
uses: actions/cache@v5
168+
uses: actions/cache@v4
168169
with:
169170
path: ~/.m2
170171
key: linux-glibc217-m2-${{ hashFiles('**/pom.xml') }}
@@ -175,16 +176,7 @@ jobs:
175176
run: |
176177
set -euxo pipefail
177178
chmod +x .github/scripts/package-client-cpp-centos7.sh
178-
docker run --rm \
179-
-v "${{ github.workspace }}:/work" \
180-
-v "${HOME}/.m2:/root/.m2" \
181-
-w /work \
182-
-e GITHUB_WORKSPACE=/work \
183-
quay.io/centos/centos:7 \
184-
bash .github/scripts/package-client-cpp-centos7.sh
185-
- name: Restore workspace ownership after container build
186-
if: always()
187-
run: sudo chown -R "$(id -u):$(id -g)" "${{ github.workspace }}"
179+
bash .github/scripts/package-client-cpp-centos7.sh
188180
- name: Resolve package zip
189181
id: pkg
190182
shell: bash
@@ -199,7 +191,7 @@ jobs:
199191
echo "path=${zips[0]}" >> "$GITHUB_OUTPUT"
200192
echo "name=$(basename "${zips[0]}" .zip)" >> "$GITHUB_OUTPUT"
201193
- name: Upload zip artifact
202-
uses: actions/upload-artifact@v6
194+
uses: actions/upload-artifact@v4
203195
with:
204196
name: ${{ steps.pkg.outputs.name }}
205197
path: ${{ steps.pkg.outputs.path }}

0 commit comments

Comments
 (0)