chore: Use install-deps action

samuelburnham · Mar 8, 2024 · 779353f · 779353f
1 parent 32ca419
commit 779353f
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 8 deletions.
diff --git a/.github/workflows/bench-deploy.yml b/.github/workflows/bench-deploy.yml
@@ -14,6 +14,10 @@ on:
         required: false
         default: 'LURK'
         type: string
+      # List of prerequisite Ubuntu packages, separated by whitespace
+      packages:
+        required: false
+        type: string
 
 jobs:
   benchmark:
@@ -27,7 +31,10 @@ jobs:
         with:
           gpu-framework: 'cuda'
       - uses: ./.github/actions/ci-env
-      # Install deps
+      - uses: ./.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/bench-pr-comment.yml b/.github/workflows/bench-pr-comment.yml
@@ -36,6 +36,10 @@ on:
       default-env:
         type: string
         required: false
+      # List of prerequisite Ubuntu packages, separated by whitespace
+      packages:
+        required: false
+        type: string
 
 jobs:
   setup:
@@ -135,6 +139,10 @@ jobs:
         with:
           gpu-framework: 'cuda'
       - uses: ./.github/actions/ci-env
+      - uses: ./.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
         # Get base branch of the PR
       - uses: xt0rted/pull-request-comment-branch@v2
         id: comment-branch

diff --git a/.github/workflows/check-lurk-compiles.yml b/.github/workflows/check-lurk-compiles.yml
@@ -7,6 +7,10 @@ on:
         required: false
         default: 'ubuntu-latest'
         type: string
+      # List of prerequisite Ubuntu packages, separated by whitespace
+      packages:
+        required: false
+        type: string
 
 jobs:
   check-lurk-compiles:
@@ -17,6 +21,10 @@ jobs:
         with:
           repository: lurk-lab/ci-workflows
       - uses: ./.github/actions/ci-env
+      - uses: ./.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -7,6 +7,10 @@ on:
         required: false
         default: 'ubuntu-latest'
         type: string
+      # List of prerequisite Ubuntu packages, separated by whitespace
+      packages:
+        required: false
+        type: string
 
 jobs:
   codecov-grcov:
@@ -19,6 +23,10 @@ jobs:
         with:
           repository: lurk-lab/ci-workflows
       - uses: ./.github/actions/ci-env
+      - uses: ./.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
       - uses: actions/checkout@v4
         with:
           submodules: recursive

diff --git a/.github/workflows/gpu-bench.yml b/.github/workflows/gpu-bench.yml
@@ -8,6 +8,11 @@ name: Comparative benchmarks on GPU
 
 on:
   workflow_call:
+    inputs:
+      # List of prerequisite Ubuntu packages, separated by whitespace
+      packages:
+        required: false
+        type: string
 
 jobs:
   # Run comparative benchmark against base branch, open issue on regression
@@ -22,6 +27,10 @@ jobs:
         with:
           gpu-framework: 'cuda'
       - uses: ./.github/actions/ci-env
+      - uses: ./.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
       - uses: actions/checkout@v4
       # Install dependencies
       - uses: dtolnay/rust-toolchain@stable

diff --git a/.github/workflows/gpu-ci-cuda.yml b/.github/workflows/gpu-ci-cuda.yml
@@ -14,6 +14,10 @@ on:
         required: false
         default: ""
         type: string
+      # List of prerequisite Ubuntu packages, separated by whitespace
+      packages:
+        required: false
+        type: string
 
 jobs:
   cuda:
@@ -28,6 +32,10 @@ jobs:
         with:
           gpu-framework: 'cuda'
       - uses: ./.github/actions/ci-env
+      - uses: ./.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
       - uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -36,4 +44,4 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: CUDA tests
         run: |
-          cargo nextest run --profile ci --cargo-profile dev-ci --features "cuda,${{ inputs.features }}"
+          cargo nextest run --profile ci --cargo-profile dev-ci --features "cuda,${{ inputs.features }}"
diff --git a/.github/workflows/gpu-ci-opencl.yml b/.github/workflows/gpu-ci-opencl.yml
@@ -14,6 +14,10 @@ on:
         required: false
         default: ""
         type: string
+      # List of prerequisite Ubuntu packages, separated by whitespace
+      packages:
+        required: false
+        type: string
 
 jobs:
   opencl:
@@ -28,6 +32,10 @@ jobs:
         with:
           gpu-framework: 'opencl'
       - uses: ./.github/actions/ci-env
+      - uses: ./.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
       - uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -36,4 +44,4 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: OpenCL tests
         run: |
-          cargo nextest run --profile ci --cargo-profile dev-ci --features "cuda,opencl,${{ inputs.features }}"
+          cargo nextest run --profile ci --cargo-profile dev-ci --features "cuda,opencl,${{ inputs.features }}"
diff --git a/.github/workflows/unused-deps.yml b/.github/workflows/unused-deps.yml
@@ -8,11 +8,14 @@ on:
   #  - cron: "0 0 * * *"
   workflow_call: 
     inputs:
-        # comma-separated list of features to check
-        features:
-          required: false
-          default: ""
-          type: string
+      # comma-separated list of features to check
+      features:
+        required: false
+        default: ""
+        type: string
+      packages:
+        required: false
+        type: string
 
 env:
   CARGO_TERM_COLOR: always
@@ -26,6 +29,10 @@ jobs:
         with:
           repository: lurk-lab/ci-workflows
           path: ci-workflows
+      - uses: ci-workflows/.github/actions/install-deps
+        if: inputs.packages != ''
+        with:
+          packages: "${{ inputs.packages }}"
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@cargo-udeps
       # Normally running cargo-udeps requires use of a nightly compiler