LLVM now installs compiler_packages (#55)

* LLVM now installs compiler_packages * Do std compat sanity test * Ensure compiler_packages are always installed * Ensure MSVC installs packages, fixed linter warning about exceptions
awslabs · Sep 25, 2020 · f0f56f4 · f0f56f4
1 parent cf63584
commit f0f56f4
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 6 deletions.
diff --git a/.github/workflows/sanity-test.yml b/.github/workflows/sanity-test.yml
@@ -190,6 +190,29 @@ jobs:
       - name: Build aws-c-common
         run: python3 builder.pyz build --project aws-c-common --compiler=${{ matrix.compiler }} run_tests=false
 
+  # Make sure linux compilers + stdlibs are installing properly
+  std-compat:
+    needs: [package, sanity_test]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: [gcc-8, clang-9]
+        std: [c++11, c++14, c++17, c++2a]
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v1
+
+      - name: Install builder
+        uses: actions/download-artifact@v1
+        with:
+          name: builder
+          path: .
+
+      - name: Build aws-crt-cpp with ${{ matrix.compiler }}/${{ matrix.std }}
+        run: |
+          export CXXFLAGS=-std=${{ matrix.std }}
+          python3 builder.pyz build -p aws-crt-cpp --compiler=${{ matrix.compiler }}
+
   release_notes:
     strategy:
       fail-fast: false

diff --git a/builder/imports/gcc.py b/builder/imports/gcc.py
@@ -26,9 +26,14 @@ def install(self, env):
         if self.installed:
             return
 
-        sh = env.shell
         config = env.config
 
+        # Ensure additional compiler packages are installed
+        packages = UniqueList(config.get('compiler_packages', []))
+        packages = [p for p in packages if not p.startswith('gcc')]
+        Script([InstallPackages(packages)],
+               name='Install compiler prereqs').run(env)
+
         installed_path, installed_version = Toolchain.find_compiler(
             env.spec.compiler, env.spec.compiler_version)
         if installed_path:
@@ -37,9 +42,8 @@ def install(self, env):
             self.installed = True
             return
 
+        # It's ok to attempt to install packages redundantly, they won't hurt anything
         packages = UniqueList(config.get('compiler_packages', []))
-        compiler = env.spec.compiler
-        version = env.spec.compiler_version
 
         Script([InstallPackages(packages)], name='install gcc').run(env)
 

diff --git a/builder/imports/llvm.py b/builder/imports/llvm.py
@@ -5,6 +5,9 @@
 from host import current_os
 from project import Import
 from toolchain import Toolchain
+from util import UniqueList
+from actions.install import InstallPackages
+from actions.script import Script
 
 import os
 import stat
@@ -99,6 +102,12 @@ def install(self, env):
             return
 
         sh = env.shell
+        config = env.config
+
+        # Ensure compiler packages are installed
+        packages = UniqueList(config.get('compiler_packages', []))
+        Script([InstallPackages(packages)],
+               name='Install compiler prereqs').run(env)
 
         installed_path, installed_version = Toolchain.find_compiler(
             env.spec.compiler, env.spec.compiler_version)
@@ -111,6 +120,7 @@ def install(self, env):
         sudo = env.config.get('sudo', current_os() == 'linux')
         sudo = ['sudo'] if sudo else []
 
+        # Strip minor version info
         version = env.toolchain.compiler_version.replace('\..+', '')
 
         script = tempfile.NamedTemporaryFile(delete=False)

diff --git a/builder/imports/msvc.py b/builder/imports/msvc.py
@@ -4,6 +4,9 @@
 from host import current_os
 from project import Import
 from toolchain import Toolchain
+from util import UniqueList
+from actions.install import InstallPackages
+from actions.script import Script
 
 
 class MSVC(Import):
@@ -23,8 +26,12 @@ def install(self, env):
         if self.installed:
             return
 
-        sh = env.shell
-        toolchain = env.toolchain
+        config = env.config
+
+        # Ensure compiler packages are installed
+        packages = UniqueList(config.get('compiler_packages', []))
+        Script([InstallPackages(packages)],
+               name='Install compiler prereqs').run(env)
 
         installed_path, installed_version = Toolchain.find_compiler(
             env.spec.compiler, env.spec.compiler_version)
@@ -34,5 +41,5 @@ def install(self, env):
             self.installed = True
             return
 
-        raise Exception('MSVC does not support dynamic install, and {} {} could not be found'.format(
+        raise EnvironmentError('MSVC does not support dynamic install, and {} {} could not be found'.format(
             env.spec.compiler, env.spec.compiler_version))