fix #551

smnorris · Jul 23, 2024 · 3c9ab5e · 3c9ab5e
1 parent c967248
commit 3c9ab5e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/production-bcfishpass.yaml b/.github/workflows/production-bcfishpass.yaml
@@ -25,17 +25,26 @@ jobs:
     runs-on: ubuntu-latest
     environment: production
     container: ghcr.io/smnorris/bcfishpass:main
-    needs: load-csv
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Build modelled crossings
+      - name: Load modelled crossings from archive
         run:  jobs/load_modelled_stream_crossings
-  prep:
+  model-xings:
     runs-on: ubuntu-latest
     environment: production
     container: ghcr.io/smnorris/bcfishpass:main
     needs: load-xings
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Build modelled crossings
+        run:  jobs/model_stream_crossings
+  prep:
+    runs-on: ubuntu-latest
+    environment: production
+    container: ghcr.io/smnorris/bcfishpass:main
+    needs: model-xings
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4

diff --git a/README.md b/README.md
@@ -68,14 +68,11 @@ Load source data:
     jobs/load_static                     
     jobs/load_monthly
     jobs/load_weekly
-
-Load cached bcfishpass data:
-
-    jobs/load_gradient_barriers
     jobs/load_modelled_stream_crossings
 
 Run the model:
 
+    jobs/model_stream_crossings    # (optionally - this is only needs to be run on the primary provincial bcfishpass database)
     jobs/model_prep
     jobs/model_run