more fixes

steineggerlab · Dec 5, 2023 · 30b02db · 30b02db
1 parent d1742d1
commit 30b02db
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
             STATIC: 0
             MPI: 1
             BUILD_TYPE: RelWithDebInfo
-          - SIMD: ASAN
+          - SIMD: AVX2
             STATIC: 0
             MPI: 0
             BUILD_TYPE: ASanOpt
@@ -74,16 +74,16 @@ jobs:
           submodules: true
 
       - name: Install G++
-        if: matrix.BUILD_TYPE == 'ASanOpt'
         run: |
-          sudo apt-get install -y g++-12
+          sudo apt-get update
+          sudo apt-get install -y g++-12 rustc cargo
 
       - name: Install Dependencies
         if: matrix.MPI == 1
         run: |
           sudo apt-get update
           sudo apt-get -y install mpi-default-dev mpi-default-bin
-
+         
       - name: Build Foldmason
         run: |
           mkdir build
@@ -135,6 +135,10 @@ jobs:
             CPREF: aarch64
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
       - name: Install Toolchain
         run: |
           sudo dpkg --add-architecture ${{ matrix.ARCH }}
@@ -150,6 +154,7 @@ jobs:
           HEREDOC
           sudo apt-get update
           sudo apt-get -y install -o APT::Immediate-Configure=false crossbuild-essential-${{ matrix.ARCH }} zlib1g-dev:${{ matrix.ARCH }} libbz2-dev:${{ matrix.ARCH }}
+          rustup target add ${{ matrix.CPREF }}-unknown-linux-gnu
 
       - name: Build Cross
         run: |
@@ -159,6 +164,7 @@ jobs:
             -DBUILD_SHARED_LIBS=OFF \
             -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++" \
             -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
+            -DRust_CARGO_TARGET=${{ matrix.CPREF }}-unknown-linux-gnu \
             -DENABLE_WERROR=1 -DHAVE_${{ matrix.SIMD }}=1 ..
           make -j $(nproc --all)