Skip to content

Commit 70c3a44

Browse files
committed
convert script to command and install python 3.8 for AL2
1 parent 3865845 commit 70c3a44

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,12 @@ jobs:
188188
- name: Build ${{ env.PACKAGE_NAME }}
189189
run: |
190190
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
191-
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
191+
if [ "${{ matrix.image }}" = "al2-x64" ]; then
192+
aws ecr get-login-password | docker login 123124136734.dkr.ecr.us-east-1.amazonaws.com -u AWS --password-stdin
193+
docker run --env GITHUB_REF --env GITHUB_HEAD_REF --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_SESSION_TOKEN --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH --env CTEST_PARALLEL_LEVEL --entrypoint='' 123124136734.dkr.ecr.us-east-1.amazonaws.com/aws-crt-${{ matrix.image }}:${{ env.BUILDER_VERSION }} bash -c 'amazon-linux-extras install python3.8 -y && curl -sSL -o /usr/local/bin/builder.pyz https://d19elf31gohf1l.cloudfront.net/releases/${{ env.BUILDER_VERSION }}/builder.pyz && chmod a+x /usr/local/bin/builder.pyz && /usr/local/bin/builder.pyz build -p ${{ env.PACKAGE_NAME }} --python=python3.8 --version=${{ env.BUILDER_VERSION }}'
194+
else
195+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
196+
fi
192197
193198
linux-compiler-compat:
194199
runs-on: ubuntu-24.04 # latest
@@ -219,21 +224,8 @@ jobs:
219224
aws sts get-caller-identity
220225
- name: Build ${{ env.PACKAGE_NAME }}
221226
run: |
222-
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
223-
# Create modified container script that installs Python 3.10
224-
cat > ./linux-container-ci-python310.sh << 'EOF'
225-
#!/bin/bash
226-
set -e
227-
BUILDER_VERSION=$1
228-
shift
229-
IMAGE_NAME=$1
230-
shift
231227
aws ecr get-login-password | docker login 123124136734.dkr.ecr.us-east-1.amazonaws.com -u AWS --password-stdin
232-
export DOCKER_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/${IMAGE_NAME}:${BUILDER_VERSION}
233-
docker run --env GITHUB_REF --env GITHUB_HEAD_REF --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_SESSION_TOKEN --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH --env CTEST_PARALLEL_LEVEL --env BUILDER_ARGS="$*" --entrypoint='' $DOCKER_IMAGE bash -c 'apt-get update && apt-get install -y wget build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libreadline-dev libffi-dev libsqlite3-dev && cd /tmp && wget https://www.python.org/ftp/python/3.10.12/Python-3.10.12.tgz && tar xzf Python-3.10.12.tgz && cd Python-3.10.12 && ./configure && make -j4 && make altinstall && cd /root && curl -sSL -o /usr/local/bin/builder.pyz https://d19elf31gohf1l.cloudfront.net/releases/'${BUILDER_VERSION}'/builder.pyz && chmod a+x /usr/local/bin/builder.pyz && echo "About to run: /usr/local/bin/builder.pyz build -p aws-crt-python --compiler=clang-8 --version='${BUILDER_VERSION}'" && /usr/local/bin/builder.pyz build -p aws-crt-python --compiler=clang-8 --version='${BUILDER_VERSION}''
234-
EOF
235-
chmod +x ./linux-container-ci-python310.sh
236-
./linux-container-ci-python310.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }}
228+
docker run --env GITHUB_REF --env GITHUB_HEAD_REF --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_SESSION_TOKEN --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH --env CTEST_PARALLEL_LEVEL --entrypoint='' 123124136734.dkr.ecr.us-east-1.amazonaws.com/aws-crt-${{ env.LINUX_BASE_IMAGE }}:${{ env.BUILDER_VERSION }} bash -c 'apt-get update && apt-get install -y wget build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libreadline-dev libffi-dev libsqlite3-dev && cd /tmp && wget https://www.python.org/ftp/python/3.10.12/Python-3.10.12.tgz && tar xzf Python-3.10.12.tgz && cd Python-3.10.12 && ./configure && make -j4 && make altinstall && cd /root && curl -sSL -o /usr/local/bin/builder.pyz https://d19elf31gohf1l.cloudfront.net/releases/${{ env.BUILDER_VERSION }}/builder.pyz && chmod a+x /usr/local/bin/builder.pyz && /usr/local/bin/builder.pyz build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --version=${{ env.BUILDER_VERSION }}'
237229
238230
use-system-libcrypto:
239231
runs-on: ubuntu-24.04 # latest

0 commit comments

Comments
 (0)