Use ManyLinux 2014 image for Linux Builds (#838)

awslabs · Oct 24, 2024 · cd5061c · cd5061c
1 parent 69d43f3
commit cd5061c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -221,10 +221,9 @@ jobs:
           python3 codebuild/macos_compatibility_check.py
 
   android:
-      # ubuntu-20.04 comes with Android tooling, see:
-      # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#android
+      # ubuntu-24.04 comes with Android tooling
     name: Android
-    runs-on: ubuntu-20.04 # latest
+    runs-on: ubuntu-24.04 # latest
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2G
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/codebuild/cd/manylinux-x64-build.yml b/codebuild/cd/manylinux-x64-build.yml
@@ -1,20 +1,15 @@
 version: 0.2
-#this build spec assumes the manylinux CentOS5 custom image
-#additional packages we installed: cmake 3.5, libcrypto 1.1.0j, gcc 4.8.4, openjdk8, maven 3.6.0, gnupg 2.0.10
 phases:
   install:
     commands:
   pre_build:
     commands:
       - export CC=gcc
-      - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.51.zip" -o "awscliv2.zip"
-      - unzip awscliv2.zip
-      - ./aws/install
   build:
     commands:
       - cd aws-crt-java
       - git submodule update --init
-      - JAVA_HOME=/opt/java-se-8u40-ri/ mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64
+      - mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64
 
   post_build:
     commands:

diff --git a/codebuild/cd/manylinux-x64-fips-build.yml b/codebuild/cd/manylinux-x64-fips-build.yml
@@ -1,15 +1,10 @@
 version: 0.2
-#this build spec assumes the manylinux CentOS5 custom image
-#additional packages we installed: cmake 3.5, libcrypto 1.1.0j, gcc 4.8.4, openjdk8, maven 3.6.0, gnupg 2.0.10
 phases:
   install:
     commands:
   pre_build:
     commands:
       - export CC=gcc
-      - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.51.zip" -o "awscliv2.zip"
-      - unzip awscliv2.zip
-      - ./aws/install
   build:
     commands:
       - cd aws-crt-java
@@ -19,7 +14,7 @@ phases:
       - curl -OL https://go.dev/dl/go1.21.6.linux-amd64.tar.gz && mkdir ./go
       - tar -C ./go -xvf go1.21.6.linux-amd64.tar.gz
       - export PATH=$PATH:./go/go/bin
-      - JAVA_HOME=/opt/java-se-8u40-ri/ mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64-fips -Dcmake.crt_fips=ON
+      - mvn -B package -DskipTests -Dcrt.classifier=linux-x86_64-fips -Dcmake.crt_fips=ON
 
   post_build:
     commands:

diff --git a/codebuild/cd/manylinux-x86-build.yml b/codebuild/cd/manylinux-x86-build.yml
@@ -1,20 +1,15 @@
 version: 0.2
-#this build spec assumes the manylinux CentOS5 custom image
-#additional packages we installed: cmake 3.5, libcrypto 1.1.0j, gcc 4.8.4, openjdk8, maven 3.6.0, gnupg 2.0.10
 phases:
   install:
     commands:
   pre_build:
     commands:
       - export CC=gcc
-      # AWSCLI v2 not available on x86, so installing v1
-      - /opt/python/cp37-cp37m/bin/python -m pip install --upgrade awscli
-      - ln -s `find /opt -name aws` /usr/local/bin/aws
   build:
     commands:
       - cd aws-crt-java
       - git submodule update --init
-      - JAVA_HOME=/opt/jdk1.8.0_201/ setarch i386 mvn -B package -DskipTests -Punix-x86 -Dcrt.classifier=linux-x86_32
+      - setarch i386 mvn -B package -DskipTests -Punix-x86 -Dcrt.classifier=linux-x86_32
   post_build:
     commands:
       # upload artifacts to S3

diff --git a/src/native/mqtt5_packets.c b/src/native/mqtt5_packets.c
@@ -987,7 +987,7 @@ struct aws_mqtt5_packet_disconnect_view_java_jni *aws_mqtt5_packet_disconnect_vi
     /* Needed to track if optionals are set or not */
     bool was_value_set = false;
 
-    uint32_t reason_code_enum;
+    uint32_t reason_code_enum = 0;
     if (aws_get_enum_from_jobject(
             env,
             java_disconnect_packet,