Skip to content

Commit 153b4fd

Browse files
bretambrosebretambrose
authored
Merge branch 'main' into dependabot/github_actions/aws-actions/stale-issue-cleanup-6
2 parents 79e88cc + e06d615 commit 153b4fd

File tree

18 files changed

+164
-101
lines changed

18 files changed

+164
-101
lines changed

‎.github/docker-images/debian-stretch-arm32v5/Dockerfile

-33
This file was deleted.

‎.github/docker-images/debian-stretch-arm32v7/Dockerfile

-33
This file was deleted.

‎.github/docker-images/manylinux2014-aarch64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN /opt/python/cp39-cp39/bin/python -m pip install --upgrade setuptools virtual
2222
###############################################################################
2323
# nodejs/npm
2424
###############################################################################
25-
RUN curl -sL https://rpm.nodesource.com/setup_12.x | sudo bash -
25+
RUN curl -sL https://rpm.nodesource.com/setup_14.x | sudo bash -
2626
RUN sudo yum -y install nodejs && node --version
2727

2828
###############################################################################

‎.github/docker-images/swift-5-al2-x64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://hub.docker.com/_/swift
2-
FROM swift:5.5.3-amazonlinux2
2+
FROM swift:5.7.3-amazonlinux2
33

44
###############################################################################
55
# Install prereqs

‎.github/docker-images/swift-5-centos-x64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://hub.docker.com/_/swift
2-
FROM swift:5.5.3-centos7
2+
FROM swift:5.7.3-centos7
33

44
###############################################################################
55
# Install prereqs

‎.github/docker-images/swift-5-ubuntu-x64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://hub.docker.com/_/swift
2-
FROM swift:5.5.3-focal
2+
FROM swift:5.7.3-focal
33

44
###############################################################################
55
# Install prereqs

‎.github/docker-images/ubuntu-22-x64/Dockerfile

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
FROM ubuntu:22.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
5+
###############################################################################
6+
# Install prereqs
7+
###############################################################################
8+
RUN apt-get update -qq \
9+
&& apt-get -y install \
10+
git \
11+
curl \
12+
sudo \
13+
unzip \
14+
python3-dev \
15+
python3-pip \
16+
build-essential \
17+
# For PPAs
18+
software-properties-common \
19+
apt-transport-https \
20+
ca-certificates \
21+
&& apt-get clean
22+
23+
###############################################################################
24+
# Python/AWS CLI
25+
###############################################################################
26+
WORKDIR /tmp
27+
28+
RUN python3 -m pip install setuptools \
29+
&& curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o awscliv2.zip \
30+
&& unzip awscliv2.zip \
31+
&& sudo aws/install \
32+
&& aws --version
33+
34+
###############################################################################
35+
# Install pre-built CMake
36+
###############################################################################
37+
RUN curl -sSL https://d19elf31gohf1l.cloudfront.net/_binaries/cmake/cmake-3.13-manylinux1-x64.tar.gz -o cmake.tar.gz \
38+
&& tar xvzf cmake.tar.gz -C /usr/local \
39+
&& cmake --version \
40+
&& rm -f /tmp/cmake.tar.gz
41+
42+
###############################################################################
43+
# Install entrypoint
44+
###############################################################################
45+
ADD entrypoint.sh /usr/local/bin/builder
46+
RUN chmod a+x /usr/local/bin/builder
47+
ENTRYPOINT ["/usr/local/bin/builder"]

‎.github/workflows/create-channel.yml

+35-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout Source
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
- name: Get release tag
3434
uses: ./.github/actions/release-tag
@@ -71,16 +71,14 @@ jobs:
7171
- ubuntu-18-x64
7272
- ubuntu-20-x64
7373
- ubuntu-20-aarch64
74-
- debian-stretch-arm32v5
75-
- debian-stretch-arm32v7
74+
- ubuntu-22-x64
7675
- node-10-linux-x64
7776
- swift-5-al2-x64
7877
- swift-5-centos-x64
7978
- swift-5-ubuntu-x64
8079
- rhel8-x64
8180
- opensuse-leap
8281
- fedora-34-x64
83-
- raspbian-bullseye
8482
- alpine-3.16-x64
8583
- alpine-3.16-x86
8684
- alpine-3.16-arm64
@@ -90,7 +88,7 @@ jobs:
9088

9189
steps:
9290
- name: Checkout Sources
93-
uses: actions/checkout@v3
91+
uses: actions/checkout@v4
9492

9593
- name: Get release tag
9694
uses: ./.github/actions/release-tag
@@ -126,3 +124,35 @@ jobs:
126124
run: |
127125
export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
128126
docker push ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:$IMAGE_TAG
127+
128+
# The job will directly pull the image from the latest, and push to the new tag.
129+
# This job is only for a temporary fix. The cheated image would not get updated.
130+
passthrough-images:
131+
name: ${{ matrix.variant }}
132+
runs-on: ubuntu-latest
133+
strategy:
134+
fail-fast: false
135+
matrix:
136+
variant:
137+
- raspbian-bullseye
138+
139+
steps:
140+
- name: Checkout Sources
141+
uses: actions/checkout@v4
142+
143+
- name: Get release tag
144+
uses: ./.github/actions/release-tag
145+
id: tag
146+
147+
- name: Login to docker repo
148+
run: aws ecr get-login-password --region us-east-1 | docker login ${{ secrets.AWS_ECR_REPO }} -u AWS --password-stdin
149+
150+
- name: Pull latest image and push
151+
run: |
152+
if ! aws --region us-east-1 ecr describe-repositories --repository-names aws-crt-${{ matrix.variant }} > /dev/null 2>&1; then \
153+
exit 1
154+
fi
155+
export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
156+
docker pull ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:latest
157+
docker tag ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:latest ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:$IMAGE_TAG
158+
docker push ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:$IMAGE_TAG

‎.github/workflows/create-release.yml

+35-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout Source
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Get release tag
2626
uses: ./.github/actions/release-tag
@@ -65,16 +65,13 @@ jobs:
6565
- ubuntu-18-x64
6666
- ubuntu-20-x64
6767
- ubuntu-20-aarch64
68-
- debian-stretch-arm32v5
69-
- debian-stretch-arm32v7
7068
- node-10-linux-x64
7169
- swift-5-al2-x64
7270
- swift-5-centos-x64
7371
- swift-5-ubuntu-x64
7472
- rhel8-x64
7573
- opensuse-leap
7674
- fedora-34-x64
77-
- raspbian-bullseye
7875
- alpine-3.16-x64
7976
- alpine-3.16-x86
8077
- alpine-3.16-arm64
@@ -84,7 +81,7 @@ jobs:
8481

8582
steps:
8683
- name: Checkout Sources
87-
uses: actions/checkout@v3
84+
uses: actions/checkout@v4
8885

8986
- name: Get release tag
9087
uses: ./.github/actions/release-tag
@@ -132,13 +129,45 @@ jobs:
132129
| aws s3 cp - s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz
133130
aws s3 cp s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz s3://${{env.AWS_S3_BUCKET}}/LATEST/aws-crt-${{ matrix.variant }}.tar.gz
134131
132+
# The job will directly pull the image from the latest, and push to the new tag.
133+
# This job is only for a temporary fix. The image would not get updated.
134+
passthrough-images:
135+
name: ${{ matrix.variant }}
136+
runs-on: ubuntu-latest
137+
strategy:
138+
fail-fast: false
139+
matrix:
140+
variant:
141+
- raspbian-bullseye
142+
143+
steps:
144+
- name: Checkout Sources
145+
uses: actions/checkout@v4
146+
147+
- name: Get release tag
148+
uses: ./.github/actions/release-tag
149+
id: tag
150+
151+
- name: Login to docker repo
152+
run: aws ecr get-login-password --region us-east-1 | docker login ${{ secrets.AWS_ECR_REPO }} -u AWS --password-stdin
153+
154+
- name: Pull latest image and push
155+
run: |
156+
if ! aws --region us-east-1 ecr describe-repositories --repository-names aws-crt-${{ matrix.variant }} > /dev/null 2>&1; then \
157+
exit 1
158+
fi
159+
export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
160+
docker pull ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:latest
161+
docker tag ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:latest ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:$IMAGE_TAG
162+
docker push ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:$IMAGE_TAG
163+
135164
upload-ci-script:
136165
name: Upload container ci script
137166
runs-on: ubuntu-latest
138167

139168
steps:
140169
- name: Checkout Source
141-
uses: actions/checkout@v3
170+
uses: actions/checkout@v4
142171

143172
- name: Get release tag
144173
uses: ./.github/actions/release-tag

‎.github/workflows/handle-stale-discussions.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: HandleStaleDiscussions
2+
on:
3+
schedule:
4+
- cron: '0 */4 * * *'
5+
discussion_comment:
6+
types: [created]
7+
8+
jobs:
9+
handle-stale-discussions:
10+
name: Handle stale discussions
11+
runs-on: ubuntu-latest
12+
permissions:
13+
discussions: write
14+
steps:
15+
- name: Stale discussions action
16+
uses: aws-github-ops/handle-stale-discussions@v1
17+
env:
18+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
19+

‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Source
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Build and Test
1717
run: |

‎.github/workflows/linux-container-ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ shift
1111

1212
aws ecr get-login-password | docker login 123124136734.dkr.ecr.us-east-1.amazonaws.com -u AWS --password-stdin
1313
export DOCKER_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/${IMAGE_NAME}:${BUILDER_VERSION}
14-
docker run --env GITHUB_REF --env GITHUB_HEAD_REF --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH $DOCKER_IMAGE --version=${BUILDER_VERSION} $@
14+
docker run --env GITHUB_REF --env GITHUB_HEAD_REF --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH --env CTEST_PARALLEL_LEVEL $DOCKER_IMAGE --version=${BUILDER_VERSION} $@

0 commit comments

Comments
 (0)