remove unused part

awslabs · Jan 11, 2024 · ddf1107 · ddf1107
1 parent 70899c2
commit ddf1107
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/.github/docker-images/ubuntu-18-x64/Dockerfile b/.github/docker-images/ubuntu-18-x64/Dockerfile
@@ -22,14 +22,8 @@ RUN apt-get update -qq \
     software-properties-common \
     apt-transport-https \
     ca-certificates \
-    perl \
     && apt-get clean
 
-# Add the longsleep/golang-backports PPA
-RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository ppa:longsleep/golang-backports && apt-get update
-
-RUN apt-get install -y golang-go
-
 ###############################################################################
 # Python/AWS CLI
 ###############################################################################

diff --git a/.github/docker-images/ubuntu-20-x64/Dockerfile b/.github/docker-images/ubuntu-20-x64/Dockerfile
@@ -18,7 +18,6 @@ RUN apt-get update -qq \
     software-properties-common \
     apt-transport-https \
     ca-certificates \
-    golang-1.18 \
     && apt-get clean
 
 ###############################################################################

diff --git a/.github/docker-images/ubuntu-22-x64/Dockerfile b/.github/docker-images/ubuntu-22-x64/Dockerfile
@@ -18,7 +18,6 @@ RUN apt-get update -qq \
     software-properties-common \
     apt-transport-https \
     ca-certificates \
-    golang-go \
     && apt-get clean
 
 ###############################################################################

diff --git a/builder/imports/awslc.py b/builder/imports/awslc.py
@@ -11,7 +11,7 @@
     'targets': ['linux', 'android'],
     'test_steps': [],
     'build_tests': False,
-    'cmake_args': ['-DFIPS=ON', '-DBUILD_LIBSSL=OFF']
+    'cmake_args': ['-DDISABLE_GO=ON', '-DBUILD_LIBSSL=OFF']
 }
 
 
@@ -21,7 +21,6 @@ def __init__(self, **kwargs):
             del kwargs['name']
         super().__init__(
             library=True,
-            imports=['golang'],
             account='aws',
             name='aws-lc',
             config=config,
@@ -50,7 +49,6 @@ def __init__(self, **kwargs):
             del kwargs['name']
         super().__init__(
             account='aws',
-            imports=['golang'],
             name='aws-lc',
             **config,
             **kwargs)
@@ -61,4 +59,4 @@ def cmake_args(self, env):
             # Not disable PERL for old GCC to avoid the pre-compiled binary with AVX512
             return super().cmake_args(env) + ['-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON']
         else:
-            return super().cmake_args(env)
+            return super().cmake_args(env) + ['-DDISABLE_PERL=ON']