Adapt workflows to skraus-dev#35

- Install build dependencies when building the UHID stuff. - Build UHID stuff on native linux only for now.
felfert · Apr 30, 2023 · e9f04a7 · e9f04a7
1 parent 5852f00
commit e9f04a7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -3,6 +3,10 @@ name: CD # Continuous Deployment
 on:
   push:
 
+env:
+  CARGO_TERM_COLOR: always
+  INSTALLDEPS: "sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libclang-dev clang llvm"
+
 jobs:
 
   publish:
@@ -20,34 +24,44 @@ jobs:
             binary-postfix: ""
             use-cross: false
             cargo-command: cargo
+            buildopts: ""
+            install-builddeps = false
           - os: ubuntu-latest
             os-name: linux
             target: x86_64-unknown-linux-gnu
             architecture: x86_64
             binary-postfix: ""
             use-cross: false
             cargo-command: cargo
+            buildopts: "--all --features uhid"
+            install-builddeps = true
           - os: windows-latest
             os-name: windows
             target: x86_64-pc-windows-msvc
             architecture: x86_64
             binary-postfix: ".exe"
             use-cross: false
             cargo-command: cargo
+            buildopts: ""
+            install-builddeps = false
           - os: ubuntu-latest
             os-name: linux
             target: aarch64-unknown-linux-gnu
             architecture: arm64
             binary-postfix: ""
             use-cross: true
             cargo-command: cross
+            buildopts: ""
+            install-builddeps = false
           - os: ubuntu-latest
             os-name: linux
             target: i686-unknown-linux-gnu
             architecture: i686
             binary-postfix: ""
             use-cross: true
             cargo-command: cross
+            buildopts: ""
+            install-builddeps = false
 
     steps:
       - name: Checkout repository
@@ -58,9 +72,12 @@ jobs:
       - name: Install cross
         if: ${{ matrix.job.use-cross }}
         run: cargo install cross
+      - name: Install build dependencies
+        if: ${{ matrix.job.install-builddeps }}
+        run: ${{ env.INSTALLDEPS }}
 
       - name: Cargo build
-        run: ${{ matrix.job.cargo-command }} build --release --target ${{ matrix.job.target }} --all
+        run: ${{ matrix.job.cargo-command }} build --release --target ${{ matrix.job.target }} ${{ matrix.job.buildopts }}
 
       - name: install strip command
         shell: bash
@@ -133,4 +150,4 @@ jobs:
         with:
           toolchain: stable
       - name: Publish crate
-        run: cargo publish -p cherryrgb --token ${{ secrets.CARGO_API_KEY }}
+        run: cargo publish -p cherryrgb --token ${{ secrets.CARGO_API_KEY }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,10 @@ on:
     branches: [master]
   pull_request:
 
+env:
+  CARGO_TERM_COLOR: always
+  INSTALLDEPS: "sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libclang-dev clang llvm"
+
 jobs:
 
   test:
@@ -13,6 +17,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - name: Install build dependencies
+        run: ${{ env.INSTALLDEPS }}
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
@@ -37,6 +43,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - name: Install build dependencies
+        run: ${{ env.INSTALLDEPS }}
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
@@ -50,6 +58,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - name: Install build dependencies
+        run: ${{ env.INSTALLDEPS }}
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable