CI fix

not-fl3 · Jun 21, 2022 · 77a6094 · 77a6094
1 parent 1e0bbb8
commit 77a6094
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -10,9 +10,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, target: 'x86_64-unknown-linux-gnu' }
           - { os: ubuntu-latest, target: 'aarch64-unknown-linux-gnu' }
-          - { os: ubuntu-latest, target: 'armv7-unknown-linux-gnueabihf' }    
+          - { os: ubuntu-latest, target: 'armv7-unknown-linux-gnueabihf' }
+          - { os: ubuntu-latest, target: 'x86_64-unknown-linux-gnu' }
           - { os: ubuntu-latest, target: 'x86_64-pc-windows-gnu' }
           - { os: ubuntu-latest, target: 'wasm32-unknown-unknown' }
           - { os: macos-latest, target: 'x86_64-apple-darwin' }
@@ -42,14 +42,24 @@ jobs:
           sudo cp /usr/x86_64-w64-mingw32/lib/crt2.o  ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/crt2.o
           echo "[target.x86_64-pc-windows-gnu]" >> ~/.cargo/config
           echo "linker = \"/usr/bin/x86_64-w64-mingw32-gcc\"" >> ~/.cargo/config
+      - name: Setup aarch64
+        if: matrix.config.target == 'aarch64-unknown-linux-gnu'
+        run: |
+          sudo apt install gcc-aarch64-linux-gnu
+          echo "[target.aarch64-unknown-linux-gnu]" >> ~/.cargo/config
+          echo "linker = \"aarch64-linux-gnu-gcc\"" >> ~/.cargo/config
+      - name: Setup armv7
+        if: matrix.config.target == 'armv7-unknown-linux-gnueabihf'
+        run: |
+          sudo apt install gcc-arm-linux-gnueabihf
+          echo "[target.armv7-unknown-linux-gnueabihf]" >> ~/.cargo/config
+          echo "linker = \"arm-linux-gnueabihf-gcc\"" >> ~/.cargo/config
+
       - uses: actions-rs/cargo@v1
         with:
           command: build
           args: --all-targets --target=${{ matrix.config.target }}
 
-
-
-
   android:
     name: Android
     runs-on: ubuntu-latest