Skip to content

Commit 693ca26

Browse files
Fix Ruby integration CI (#2765)
### Issues: Resolves `P315730123` ### Description of changes: * Ruby integration CI with versions 3.3. and 3.4 was broken due to broken patches. * Ruby master branch CI required Cmake 3.26 now, so I've upgraded to a newer image. ### Call-outs: N/A ### Testing: CI By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license. --------- Co-authored-by: Sean McGrail <[email protected]>
1 parent cd457a9 commit 693ca26

File tree

4 files changed

+141
-126
lines changed

4 files changed

+141
-126
lines changed

.github/docker_images/aws-lc/ubuntu/Dockerfile.2404

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ apt-get -y --no-install-recommends install \
1818
cmake \
1919
curl \
2020
git \
21+
libffi-dev \
22+
libgmp-dev \
23+
libssl-dev \
2124
libunwind-dev \
25+
libyaml-dev \
2226
lld \
2327
llvm \
2428
llvm-dev \
@@ -27,7 +31,8 @@ apt-get -y --no-install-recommends install \
2731
pkg-config \
2832
software-properties-common \
2933
unzip \
30-
wget
34+
wget \
35+
zlib1g-dev
3136
apt-get autoremove --purge -y
3237
apt-get clean
3338
apt-get autoclean
@@ -63,4 +68,14 @@ setup_script="/tmp/setup-go-compiler.sh"
6368
${setup_script}
6469
EOF
6570

71+
# Install Ruby
72+
ENV RBENV_ROOT="/.rbenv"
73+
ENV PATH="${RBENV_ROOT}/shims:${RBENV_ROOT}/bin:$PATH"
74+
75+
COPY --from=scripts setup-ruby.sh /tmp
76+
RUN <<EOF
77+
setup_script="/tmp/setup-ruby.sh"
78+
${setup_script}
79+
EOF
80+
6681
RUN rm -rf /tmp/*

.github/workflows/integration_omnibus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ jobs:
457457
- uses: ./.github/actions/codebuild-docker-run
458458
name: Run Container
459459
with:
460-
image: ${{ steps.login-ecr.outputs.registry }}/aws-lc/ubuntu:22.04
460+
image: ${{ steps.login-ecr.outputs.registry }}/aws-lc/ubuntu:24.04
461461
env: |
462462
FIPS
463463
ipv6: true

0 commit comments

Comments
 (0)