Skip to content

Commit cd5061c

Browse files
authored
Use ManyLinux 2014 image for Linux Builds (#838)
1 parent 69d43f3 commit cd5061c

File tree

6 files changed

+7
-23
lines changed

6 files changed

+7
-23
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,9 @@ jobs:
221221
python3 codebuild/macos_compatibility_check.py
222222
223223
android:
224-
# ubuntu-20.04 comes with Android tooling, see:
225-
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#android
224+
# ubuntu-24.04 comes with Android tooling
226225
name: Android
227-
runs-on: ubuntu-20.04 # latest
226+
runs-on: ubuntu-24.04 # latest
228227
steps:
229228
- name: Checkout Sources
230229
uses: actions/checkout@v4

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx1536m
9+
org.gradle.jvmargs=-Xmx2G
1010
# When configured, Gradle will run in incubating parallel mode.
1111
# This option should only be used with decoupled projects. More details, visit
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

codebuild/cd/manylinux-x64-build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
version: 0.2
2-
#this build spec assumes the manylinux CentOS5 custom image
3-
#additional packages we installed: cmake 3.5, libcrypto 1.1.0j, gcc 4.8.4, openjdk8, maven 3.6.0, gnupg 2.0.10
42
phases:
53
install:
64
commands:
75
pre_build:
86
commands:
97
- export CC=gcc
10-
- curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.51.zip" -o "awscliv2.zip"
11-
- unzip awscliv2.zip
12-
- ./aws/install
138
build:
149
commands:
1510
- cd aws-crt-java
1611
- git submodule update --init
17-
- JAVA_HOME=/opt/java-se-8u40-ri/ mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64
12+
- mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64
1813

1914
post_build:
2015
commands:

codebuild/cd/manylinux-x64-fips-build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
version: 0.2
2-
#this build spec assumes the manylinux CentOS5 custom image
3-
#additional packages we installed: cmake 3.5, libcrypto 1.1.0j, gcc 4.8.4, openjdk8, maven 3.6.0, gnupg 2.0.10
42
phases:
53
install:
64
commands:
75
pre_build:
86
commands:
97
- export CC=gcc
10-
- curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.51.zip" -o "awscliv2.zip"
11-
- unzip awscliv2.zip
12-
- ./aws/install
138
build:
149
commands:
1510
- cd aws-crt-java
@@ -19,7 +14,7 @@ phases:
1914
- curl -OL https://go.dev/dl/go1.21.6.linux-amd64.tar.gz && mkdir ./go
2015
- tar -C ./go -xvf go1.21.6.linux-amd64.tar.gz
2116
- export PATH=$PATH:./go/go/bin
22-
- JAVA_HOME=/opt/java-se-8u40-ri/ mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64-fips -Dcmake.crt_fips=ON
17+
- mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64-fips -Dcmake.crt_fips=ON
2318

2419
post_build:
2520
commands:

codebuild/cd/manylinux-x86-build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
version: 0.2
2-
#this build spec assumes the manylinux CentOS5 custom image
3-
#additional packages we installed: cmake 3.5, libcrypto 1.1.0j, gcc 4.8.4, openjdk8, maven 3.6.0, gnupg 2.0.10
42
phases:
53
install:
64
commands:
75
pre_build:
86
commands:
97
- export CC=gcc
10-
# AWSCLI v2 not available on x86, so installing v1
11-
- /opt/python/cp37-cp37m/bin/python -m pip install --upgrade awscli
12-
- ln -s `find /opt -name aws` /usr/local/bin/aws
138
build:
149
commands:
1510
- cd aws-crt-java
1611
- git submodule update --init
17-
- JAVA_HOME=/opt/jdk1.8.0_201/ setarch i386 mvn -B package -DskipTests -Punix-x86 -Dcrt.classifier=linux-x86_32
12+
- setarch i386 mvn -B package -DskipTests -Punix-x86 -Dcrt.classifier=linux-x86_32
1813
post_build:
1914
commands:
2015
# upload artifacts to S3

src/native/mqtt5_packets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ struct aws_mqtt5_packet_disconnect_view_java_jni *aws_mqtt5_packet_disconnect_vi
987987
/* Needed to track if optionals are set or not */
988988
bool was_value_set = false;
989989

990-
uint32_t reason_code_enum;
990+
uint32_t reason_code_enum = 0;
991991
if (aws_get_enum_from_jobject(
992992
env,
993993
java_disconnect_packet,

0 commit comments

Comments
 (0)