fix ci issues

ccfontes · Dec 20, 2023 · cb9550e · cb9550e
1 parent 95884c8
commit cb9550e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -19,7 +19,7 @@ jobs:
       with:
         java-version: 8
     - name: Install Babashka 
-      run: bash < <(curl https://raw.githubusercontent.com/babashka/babashka/master/install) --dev-build
+      run: bash < <(curl https://raw.githubusercontent.com/babashka/babashka/master/install) --dev-build --dir /usr/local/bin
     - name: Run unit tests
       run: bb --config tests.edn tests.clj
       working-directory: ${{ github.workspace }}/template/bb
diff --git a/template/bb/Dockerfile b/template/bb/Dockerfile
@@ -1,5 +1,5 @@
 FROM ghcr.io/openfaas/of-watchdog:0.9.13 AS watchdog
-FROM babashka/babashka:1.3.187-SNAPSHOT AS babashka
+FROM babashka/babashka:1.3.186 AS babashka
 FROM eclipse-temurin:8u392-b08-jdk AS build
 
 RUN set -e
@@ -19,10 +19,9 @@ WORKDIR $HOME
 
 COPY --chown=app:app index.clj bb.edn lib merge_config.clj ./
 
-RUN bb prepare
-
 COPY --chown=app:app function/bb.edn* function/bb.edn
 RUN bb merge-config --src "function/bb.edn" --out "ship.edn" && \
+    mkdir ~/.m2 && \
     bb --config ship.edn prepare && \
     bb --config ship.edn print-deps && \
     cp -r .m2 .m2-ship