Merge pull request #466 from HopkinsIDD/hotfix/411/fix-inference-ci-t…

…riggers Fix `inference CI` Triggers
HopkinsIDD · Jan 15, 2025 · 8333fa4 · 8333fa4
2 parents 9be82be + 6d81ea5
commit 8333fa4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/flepicommon-ci.yml b/.github/workflows/flepicommon-ci.yml
@@ -56,6 +56,10 @@ jobs:
         with:
           key: flepicommon-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE') }}-${{ env.R_LIBPATH_CKSUM }}-${{ env.CACHE_DATE }}
           path: ${{ env.R_LIBPATH }}
+          restore-keys: |
+            flepicommon-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE') }}-${{ env.R_LIBPATH_CKSUM }}-
+            flepicommon-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE') }}-
+            flepicommon-rlibs-${{ runner.os }}-${{ matrix.R-version }}-
       - name: Install R Dependencies
         if: steps.r-library-cache.outputs.cache-hit != 'true'
         run: |

diff --git a/.github/workflows/inference-ci.yml b/.github/workflows/inference-ci.yml
@@ -2,13 +2,12 @@ name: inference CI
 
 on:
   workflow_dispatch:
-  workflow_run:
-    workflows: ['flepicommon-ci', 'gempyor-ci']
-    types:
-      - completed
   push:
     paths:
       - flepimop/R_packages/inference/**/*
+      - flepimop/R_packages/flepicommon/**/*
+      - examples/**/*
+      - flepimop/gempyor_pkg/**/*
     branches:
       - dev
   pull_request:
@@ -20,14 +19,17 @@ on:
       - synchronize
     paths:
       - flepimop/R_packages/inference/**/*
+      - flepimop/R_packages/flepicommon/**/*
+      - examples/**/*
+      - flepimop/gempyor_pkg/**/*
     branches:
       - dev
       - main
 
 jobs:
   tests:
     runs-on: ubuntu-latest
-    if: (github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success') && (github.event_name != 'pull_request' || github.event.pull_request.draft == false)
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
     strategy:
       matrix:
         R-version: ["4.3.3"]
@@ -70,6 +72,13 @@ jobs:
         with:
           key: inference-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE', 'flepimop/R_packages/inference/DESCRIPTION', 'flepimop/R_packages/inference/NAMESPACE') }}-${{ env.R_LIBPATH_CKSUM }}-${{ env.CACHE_DATE }}
           path: ${{ env.R_LIBPATH }}
+          restore-keys: |
+            inference-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE', 'flepimop/R_packages/inference/DESCRIPTION', 'flepimop/R_packages/inference/NAMESPACE') }}-${{ env.R_LIBPATH_CKSUM }}-
+            inference-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE', 'flepimop/R_packages/inference/DESCRIPTION', 'flepimop/R_packages/inference/NAMESPACE') }}-
+            inference-rlibs-${{ runner.os }}-${{ matrix.R-version }}-
+            flepicommon-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE') }}-${{ env.R_LIBPATH_CKSUM }}-
+            flepicommon-rlibs-${{ runner.os }}-${{ matrix.R-version }}-${{ hashFiles('flepimop/R_packages/flepicommon/DESCRIPTION', 'flepimop/R_packages/flepicommon/NAMESPACE') }}-
+            flepicommon-rlibs-${{ runner.os }}-${{ matrix.R-version }}-
       - name: Install R Dependencies For flepicommon
         if: steps.r-library-cache.outputs.cache-hit != 'true'
         run: |