Remove repetitive tasks in workflow with matrix

GregoireHENRY · Dec 13, 2023 · 759e860 · 759e860
1 parent 62dc4d0
commit 759e860
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 61 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -1,16 +1,20 @@
-name: Check code can compile
+name: Check
 
 on:
   push:
     branches:        
       - '**' 
 
 jobs:
-  check-ubuntu:
-    runs-on: ubuntu-latest
+  check:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
 
     - name: Cache Rust dependencies
       uses: actions/cache@v3
@@ -20,68 +24,19 @@ jobs:
         restore-keys: |
           ${{ runner.OS }}-build-
 
-    - name: Install stable toolchain
-      uses: dtolnay/rust-toolchain@stable
-
     - name: Install SDL2
+      if: ${{ matrix.os == 'ubuntu-latest' }}
       run: sudo apt install -y libsdl2-dev
-
-    - name: Check that code can compile
-      run: cargo check
-
-  check-macos:
-    runs-on: macos-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Cache Rust dependencies
-      uses: actions/cache@v3
-      with:
-        path: target
-        key: ${{ runner.OS }}-build-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: |
-          ${{ runner.OS }}-build-
-
-    - name: Install stable toolchain
-      uses: dtolnay/rust-toolchain@stable
-
+
     - name: Install SDL2
+      if: ${{ matrix.os == 'macos-latest' }}
       run: brew install SDL2
-
-    - name: Check that code can compile
-      run: cargo check
 
-  check-windows:
-    runs-on: windows-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Cache Rust dependencies
-      uses: actions/cache@v3
-      with:
-        path: target
-        key: ${{ runner.OS }}-build-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: |
-          ${{ runner.OS }}-build-
-
-    - name: Install stable toolchain
-      uses: dtolnay/rust-toolchain@stable
-
     - name: Use SDL2 from repo/include/win
+      if: ${{ matrix.os == 'windows-latest' }}
       run: |
         cp include/win/SDL2.dll .
         cp include/win/SDL2.lib .
 
     - name: Check that code can compile
-      run: cargo check
-
-  check-self-hosted:
-    runs-on: self-hosted
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Check that code can compile
-      run: cargo check
+      run: cargo check --all-features
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kalast"
-version = "0.4.0-beta12"
+version = "0.4.0-beta13"
 authors = ["Grégoire Henry <[email protected]>"]
 edition = "2021"
 description = "Thermophysical Model for Binary Asteroids"