ci: More fixes.

fweig · Oct 29, 2024 · 0e52409 · 0e52409
1 parent debb313
commit 0e52409
Showing 1 changed file with 6 additions and 56 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -71,85 +71,35 @@ jobs:
             pkg: clang-18 libomp-18-dev
             exe: clang++-18
 
-    runs-on: ubuntu-${{ matrix.include.year }}.04
+    runs-on: ubuntu-${{ matrix.year }}.04
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Install compiler
-      run: |
-        sudo apt update
-        sudo apt install -y ${{ matrix.include.pkg }}
-    - name: Configure CMake
-      env:
-        CXX: ${{ matrix.include.exe }}
-      run: cmake -B ${{github.workspace}}/build -DXPU_BUILD_TESTS=ON -DXPU_BUILD_EXAMPLES=ON
-    - name: Build
-      # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build -j4
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
-      run: ctest
-
-  ubuntu-22:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compiler:
-          - pkg: g++-9
-            exe: g++-9
-          - pkg: g++-10
-            exe: g++-10
-          - pkg: g++-11
-            exe: g++-11
-          - pkg: g++-12
-            exe: g++-12
-          - pkg: clang-11 libomp-11-dev
-            exe: clang++-11
-          - pkg: clang-12 libomp-12-dev
-            exe: clang++-12
-          - pkg: clang-13 libomp-13-dev
-            exe: clang++-13
-          - pkg: clang-14 libomp-14-dev
-            exe: clang++-14
-          - pkg: clang-15 libomp-15-dev
-            exe: clang++-15
-    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install compiler
       run: |
         sudo apt update
-        sudo apt install -y ${{ matrix.compiler.pkg }}
+        sudo apt install -y ${{ matrix.pkg }}
     - name: Configure CMake
       env:
-        CXX: ${{ matrix.compiler.exe }}
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        CXX: ${{ matrix.exe }}
       run: cmake -B ${{github.workspace}}/build -DXPU_BUILD_TESTS=ON -DXPU_BUILD_EXAMPLES=ON
     - name: Build
-      # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build -j4
     - name: Test
       working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       env:
         CTEST_OUTPUT_ON_FAILURE: 1
       run: ctest
 
   linux-gpu:
     runs-on: self-hosted
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Configure CMake
       run: |
         . /opt/intel/oneapi/setvars.sh
         cmake -B ${{github.workspace}}/build -DXPU_ENABLE_SYCL=ON -DXPU_ENABLE_CUDA=ON -DXPU_ENABLE_HIP=ON -DXPU_BUILD_TESTS=ON -DXPU_BUILD_EXAMPLES=ON
     - name: Build
-      # Build your program with the given configuration
       run: |
         . /opt/intel/oneapi/setvars.sh
         cmake --build ${{github.workspace}}/build -j4
@@ -173,7 +123,7 @@ jobs:
         cxx_std: [20]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install compiler
       run: |