CD changes for ARM release

.builder/jdk.py

@@ -24,7 +24,7 @@
 URLs = {
     'linux-armv6': 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz',
     'linux-armv7': 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz',
-    'linux-arm64': 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u242-b08.tar.gz',
+    'linux-armv8': 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u242-b08.tar.gz',
     'linux-x64': 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz',
     'windows-x64': 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u242b08.zip',
     'windows-x86': 'https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x86-32_windows_hotspot_8u242b08.zip',
@@ -53,34 +53,40 @@ def install(self, env):
         if not env.toolchain.cross_compile:
             javac_path = util.where('javac')
             if javac_path:
-                javac_path = javac_path.replace(
-                    os.pathsep + 'bin' + os.pathsep + '.+$', '')
+                javac_path = javac_path.replace('/bin/javac', '')
             prefixes = [javac_path, os.environ.get('JAVA_HOME', None)]
             required_files = [
                 ['include/jni.h'],
-                ['lib/**/libjvm.so', '**/lib/**/libjvm.so'],
+                ['lib/**/libjvm.so', '**/lib/**/libjvm.so',
+                    'lib/**/jvm.dll', '**/lib/**/jvm.dll'],
             ]
             found = 0
-            for prefix in prefixes:
-                if not prefix:
-                    continue
-                for paths in required_files:
-                    for path in paths:
+
+            for paths in required_files:
+                path_found = False
+                for path in paths:
+                    for prefix in prefixes:
+                        if not prefix:
+                            continue
                         full_path = os.path.join(prefix, path)
                         if glob.glob(full_path, recursive=True):
                             found += 1
+                            path_found = True
                             break
+                    if path_found:
+                        break
 
-                if found >= len(required_files):
-                    print('Found existing JDK8 at {}'.format(prefix))
-                    self.path = prefix
-                    env.variables['java_home'] = self.path
-                    self.installed = True
-                    return
+            if found >= len(required_files):
+                print('Found existing JDK8 at {}'.format(prefix))
+                self.path = prefix
+                env.variables['java_home'] = self.path
+                self.installed = True
+                return
 
         target = '{}-{}'.format(env.spec.target, env.spec.arch)
         if target not in URLs:
-            raise EnvironmentError('No pre-built binaries for {} are available, please install JDK8 or greater and set JAVA_HOME'.format(target))
+            raise EnvironmentError(
+                'No pre-built binaries for {} are available, please install JDK8 or greater and set JAVA_HOME'.format(target))
 
         install_dir = os.path.join(env.deps_dir, self.name.lower())
         # If path is going to be relative, it has to be relative to the source directory
@@ -114,7 +120,7 @@ def install(self, env):
         self.path = jdk_home
         if env.toolchain.cross_compile:
             self.path = str(Path(os.path.join(install_dir, jdk_home)
-                                ).relative_to(env.source_dir))
+                                 ).relative_to(env.source_dir))
 
         env.variables['java_home'] = self.path
         self.installed = True

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
       - '!master'
 
 env:
-  BUILDER_VERSION: v0.5.0
+  BUILDER_VERSION: v0.5.1
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-crt-java
   LINUX_BASE_IMAGE: ubuntu-16-x64

builder.json

@@ -41,6 +41,9 @@
             ],
             "architectures": {
                 "armv6": {
+                    "pkg_setup": [
+                        "service docker start"
+                    ],
                     "!packages": [],
                     "!build_steps": [
                         "build"
@@ -54,6 +57,9 @@
                     ]
                 },
                 "armv7": {
+                    "pkg_setup": [
+                        "service docker start"
+                    ],
                     "!packages": [],
                     "!build_steps": [
                         "build"
@@ -67,6 +73,9 @@
                     ]
                 },
                 "arm64": {
+                    "pkg_setup": [
+                        "service docker start"
+                    ],
                     "!packages": [],
                     "!build_steps": [
                         "build"
@@ -80,6 +89,23 @@
                     ]
                 }
             }
+        },
+        "freebsd": {
+            "imports": [
+                "s2n"
+            ],
+            "packages": [
+                "openjdk8"
+            ],
+            "!build_env": {
+                "JAVA_HOME": "/usr/local/openjdk8"
+            },
+            "!build_steps": [
+                "mvn -B compile -Dlibcrypto.path={libcrypto_path}"
+            ],
+            "!test_steps": [
+                "mvn -B test -Dlibcrypto.path={libcrypto_path}"
+            ]
         }
     }
 }