From cb9550ec8df6eccdecdeb20b3a229dc881145929 Mon Sep 17 00:00:00 2001 From: Carlos Fontes Date: Wed, 20 Dec 2023 18:11:51 +0000 Subject: [PATCH] fix ci issues --- .github/workflows/unit_tests.yml | 2 +- template/bb/Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 864d9f1..afa69fc 100644 --- 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 index a93dbf6..e8c7419 100644 --- 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