From dfb497f07e9fd37640db1859b66337a36075b40c Mon Sep 17 00:00:00 2001
From: Mayel de Borniol <git@mayel.space>
Date: Tue, 13 Feb 2024 17:22:48 +0000
Subject: [PATCH] ci

---
 .github/workflows/test.yaml | 8 ++++----
 justfile                    | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f9de9397e06..49b11897e29 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -77,19 +77,19 @@ jobs:
     # - name: Remove mix.lock
     #   run: rm mix.lock
     - name: Prepare environment
-      run: just pre-setup && just init &
+      run: just pre-setup && just init 
     - name: Install dependencies
       run: mix deps.get
     - name: Update Bonfire extensions to latest git versions (just use lockfile in future?)
       run: mix bonfire.deps.update
-    - name: Fetch any differences in nested deps
-      run: mix deps.get
+    - name: Fetch any differences in nested deps (+ run post-install setup)
+      run: just deps-get && just pre-init
     - name: Clean-build Bonfire data extensions
       run: mix bonfire.deps.clean.data
     - name: Compile deps & app
       run: mix compile
     - name: Set up database
-      run: just extension-post-install && mix ecto.create && mix ecto.migrate
+      run: mix ecto.create && mix ecto.migrate
     - name: Run tests
       run: mix test
     - name: Check database down migrations 
diff --git a/justfile b/justfile
index 3aa0875dfef..cb22b9cd526 100644
--- a/justfile
+++ b/justfile
@@ -139,7 +139,6 @@ setup-dev:
 	just deps-clean-api
 	just deps-clean-unused
 	just deps-get
-	just extension-post-install
 
 extension-post-install:
 	just ext-migrations-copy
@@ -338,7 +337,7 @@ update-fork-path path cmd='pull' mindepth='0' maxdepth='1':
 	just deps-post-get
 	just js-deps-get
 
-@deps-post-get:
+@deps-post-get: extension-post-install
 	ln -sf ../../../priv/static extensions/bonfire/priv/static || ln -sf ../../../priv/static deps/bonfire/priv/static || echo "Could not find a priv/static dir to use"
 	-cd deps/bonfire/priv && ln -sf ../../../priv/repo
 	-cd extensions/bonfire/priv && ln -sf ../../../priv/repo