Uncomment stuff, and add clang.

Author: jyknight

.github/workflows/clang.yml

@@ -0,0 +1,60 @@
+name: Clang builds
+
+on: [push]
+
+jobs:
+  test_clang:
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - clang-ubuntu18.04-gcc5
+          - clang-ubuntu18.04-clang8
+          - clang-ubuntu18.04-clang8
+          - clang-win2019-clang
+          - clang-macos10.14-xcode11
+        include:
+          - name: clang-ubuntu18.04-gcc5
+            os: ubuntu-18.04
+            compiler: gcc
+            compiler-version: 5
+          - name: clang-ubuntu18.04-clang8
+            os: ubuntu-18.04
+            compiler: clang
+            compiler-version: 8
+          - name: clang-win2019-clang
+            os: windows-2019
+            compiler: clang
+            compiler-version: latest
+          - name: clang-macos10.14-xcode11
+            os: macos-10.14
+            compiler: xcode
+            compiler-version: 11
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      - name: Install deps
+        shell: bash
+        run: .github/workflows/utils/install_deps.sh ${{ runner.os }} ${{ matrix.compiler }} ${{ matrix.compiler-version }}
+      - if: runner.os == 'Linux'
+        run: echo "::set-env name=extra_cmake_args::-DLLVM_USE_LINKER=gold"
+      - name: configure
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          cmake -GNinja \
+                -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \
+                ${extra_cmake_args:-} \
+                ../llvm
+      - name: build
+        run: ninja -C build
+      - name: test
+        run: ninja -C build check
+      - name: test-clang
+        run: ninja -C build check-clang

.github/workflows/libcxx.yml

@@ -8,10 +8,9 @@ jobs:
       fail-fast: false
       matrix:
         name:
-#          - libcxx-ubuntu18.04-clang8-cxx03
-#          - libcxx-ubuntu18.04-clang8-cxx11
-          - libcxx-win2019-clang-cxx11
-#          - libcxx-macos10.14-xcode11-cxx11
+          - libcxx-ubuntu18.04-clang8-cxx03
+          - libcxx-ubuntu18.04-clang8-cxx11
+          - libcxx-macos10.14-xcode11-cxx11
         include:
           - name: libcxx-ubuntu18.04-clang8-cxx03
             os: ubuntu-18.04
@@ -23,11 +22,6 @@ jobs:
             compiler: clang
             compiler-version: 8
             cxx-std: c++11
-          - name: libcxx-win2019-clang-cxx11
-            os: windows-2019
-            compiler: clang
-            compiler-version: 8
-            cxx-std: c++11
           - name: libcxx-macos10.14-xcode11-cxx11
             os: macos-10.14
             compiler: xcode
@@ -62,56 +56,3 @@ jobs:
         run: ninja -C build check-libcxx
 #      - name: test abilist
 #        run: ninja -C build check-cxx-abilist
-
-
-#   test_clang:
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         name:
-# #          - clang-ubuntu18.04-clang8-cxx03
-# #          - clang-ubuntu18.04-clang8-cxx11
-#           - libcxx-win2019-clang-cxx11
-# #          - clang-macos10.14-xcode11-cxx11
-#         include:
-#           - name: clang-ubuntu18.04-clang8
-#             os: ubuntu-18.04
-#             compiler: clang
-#             compiler-version: 8
-#           - name: clang-ubuntu18.04-clang8
-#             os: ubuntu-18.04
-#             compiler: clang
-#             compiler-version: 8
-#           - name: libcxx-win2019-clang
-#             os: windows-2019
-#             compiler: clang
-#             compiler-version: 8
-#           - name: libcxx-macos10.14-xcode11
-#             os: macos-10.14
-#             compiler: xcode
-#             compiler-version: 11
-#     name: ${{ matrix.name }}
-#     runs-on: ${{ matrix.os }}
-#     steps:
-#       - uses: actions/checkout@v1
-#         with:
-#           fetch-depth: 1
-#       - name: Install deps
-#         shell: bash
-#         run: .github/workflows/utils/install_deps.sh ${{ runner.os }} ${{ matrix.compiler }} ${{ matrix.compiler-version }}
-#       - name: configure
-#         run: >-
-#           mkdir build &&
-#           cd build &&
-#           cmake -GNinja
-#                 -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"
-#                 -DLLVM_USE_LINKER=gold
-#                 -DCMAKE_BUILD_TYPE=Release
-#                 -DLLVM_ENABLE_ASSERTIONS:BOOL=ON
-#                 ../llvm
-#       - name: build
-#         run: ninja -C build
-#       - name: test
-#         run: ninja -C build check
-#       - name: test-clang
-#         run: ninja -C build check-clang

.github/workflows/utils/install_deps.sh

@@ -7,9 +7,14 @@ compiler=$2
 compiler_version=$3
 
 if [[ $os_kind == 'Linux' ]]; then
-  sudo apt-get install -y ninja-build "clang-${compiler_version}"
-  echo "::set-env name=CC::clang-${compiler_version}"
-  echo "::set-env name=CXX::clang++-${compiler_version}"
+  if [[ $compiler = gcc ]]; then
+    compiler_pkg="g++-${compiler_version}"
+  else
+    compiler_pkg="${compiler}-${compiler_version}"
+  fi
+  sudo apt-get install -y ninja-build "${compiler_pkg}"
+  echo "::set-env name=CC::${compiler}-${compiler_version}"
+  echo "::set-env name=CXX::${compiler}++-${compiler_version}"
 elif [[ $os_kind == 'macOS' ]]; then
   brew install ninja
   sudo xcode-select -switch "/Applications/Xcode_${compiler_version}.app"