Skip to content

Commit d644763

Browse files
committed
fixup! Update from Centos6 to Centos7 on i386 and x86_64 Java build environments as we require a version of CMake newer than 3.10 to build Snappy
1 parent 98c00ee commit d644763

1 file changed

Lines changed: 2 additions & 22 deletions

File tree

.github/workflows/pr-jobs.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -432,17 +432,7 @@ jobs:
432432
image: evolvedbinary/rocksjava:centos7_x64-be
433433
options: --shm-size=16gb
434434
steps:
435-
# The docker image is intentionally based on an OS that has an older GLIBC version.
436-
# That GLIBC is incompatibile with GitHub's actions/checkout. Thus we implement a manual checkout step.
437-
- name: Checkout
438-
env:
439-
GH_TOKEN: ${{ github.token }}
440-
run: |
441-
chown `whoami` . || true
442-
git clone --no-checkout https://oath2:$GH_TOKEN@github.com/${{ github.repository }}.git .
443-
git -c protocol.version=2 fetch --update-head-ok --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}:${{ github.ref }}
444-
git checkout --progress --force ${{ github.ref }}
445-
git log -1 --format='%H'
435+
- uses: actions/checkout@v4.1.0
446436
- uses: "./.github/actions/pre-steps"
447437
- name: Set Java Environment
448438
run: |-
@@ -460,17 +450,7 @@ jobs:
460450
image: evolvedbinary/rocksjava:centos7_x64-be
461451
options: --shm-size=16gb
462452
steps:
463-
# The docker image is intentionally based on an OS that has an older GLIBC version.
464-
# That GLIBC is incompatibile with GitHub's actions/checkout. Thus we implement a manual checkout step.
465-
- name: Checkout
466-
env:
467-
GH_TOKEN: ${{ github.token }}
468-
run: |
469-
chown `whoami` . || true
470-
git clone --no-checkout https://oath2:$GH_TOKEN@github.com/${{ github.repository }}.git .
471-
git -c protocol.version=2 fetch --update-head-ok --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}:${{ github.ref }}
472-
git checkout --progress --force ${{ github.ref }}
473-
git log -1 --format='%H'
453+
- uses: actions/checkout@v4.1.0
474454
- uses: "./.github/actions/pre-steps"
475455
- name: Set Java Environment
476456
run: |-

0 commit comments

Comments
 (0)