diff of 40042e25a8fd4533b92f48c506597798fa83949f
40042e25a8fd4533b92f48c506597798fa83949f
diff --git a/.github/workflows/build_murja.yml b/.github/workflows/build_murja.yml
index 04d641b..43edfee 100644
--- a/.github/workflows/build_murja.yml
+++ b/.github/workflows/build_murja.yml
@@ -24,21 +24,22 @@ jobs:
- name: Start db
run: |
- docker-compose up -d automatic-test-db
+ docker compose up -d automatic-test-db
docker network ls
- name: Setup and run tests
uses: addnab/docker-run-action@v3
with:
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_PASSWORD }}
image: fukamachi/sbcl:latest
options: -v ${{ github.workspace }}:/workspace -v ${{ github.workspace }}/config:/etc/murja -e MURJA_DB_HOST=automatic-test-db -e MURJA_DB_PORT=5432 -e MURJA_E2E=e2e -e GHA=true -p 3010:3010 --network aggressive-murja_murja_test_network
run: |
cd /workspace
mkdir -p ~/common-lisp
-
sbcl --load ./quicklisp.lisp --load ./install_ql.lisp
ln -s /workspace ~/common-lisp/aggressive-murja
- ln -s /workspace ~/common-lisp/aggressive-murja-tests
+ ln -s /workspace ~/common-lisp/aggressive-murja/tests
sbcl --load run_tests.lisp
build:
@@ -120,7 +121,7 @@ jobs:
- name: Start the database
run: |
- docker-compose up -d db
+ docker compose up -d db
- name: Start murja
id: tests
diff --git a/run_tests.lisp b/run_tests.lisp
index 75db10a..4f3f496 100644
--- a/run_tests.lisp
+++ b/run_tests.lisp
@@ -1,2 +1,6 @@
+(format t "updating quicklisp, do we have cl-epoch?~%")
+(ql:update-dist "quicklisp")
+(ql:system-apropos "cl-epoch")
+(format t "loading murja ~%")
(ql:quickload :aggressive-murja)
-(ql:quickload :aggressive-murja-tests)
+(ql:quickload :aggressive-murja/tests)