diff --git a/.circleci/config.yml b/.circleci/config.yml index 21e1bd7f..e8f14d92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,9 +5,7 @@ version: 2.1 # Define a job to be invoked later in a workflow. # See: https://circleci.com/docs/2.0/configuration-reference/#jobs jobs: - say-hello: - # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. - # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor + api-tests-eight: docker: - image: cimg/python:3.8 - image: cimg/postgres:12.9 @@ -15,8 +13,6 @@ jobs: POSTGRES_USER: postgres POSTGRES_DB: wrolpi POSTGRES_PASSWORD: "wrolpi" - # Add steps to the job - # See: https://circleci.com/docs/2.0/configuration-reference/#steps steps: - checkout - run: sudo apt-get update @@ -29,14 +25,50 @@ jobs: pip install -r requirements.txt - run: command: './venv/bin/pytest -svv wrolpi modules' - - save_cache: - key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - paths: - - "venv" + api-tests-nine: + docker: + - image: cimg/python:3.9 + - image: cimg/postgres:13.5 + environment: + POSTGRES_USER: postgres + POSTGRES_DB: wrolpi + POSTGRES_PASSWORD: "wrolpi" + steps: + - checkout + - run: sudo apt-get update + - run: sudo apt-get install -y ffmpeg texlive-latex-base texlive-latex-extra + - run: + name: Install Requirements + command: | + python3 -m venv venv + . venv/bin/activate + pip install -r requirements.txt + - run: + command: './venv/bin/pytest -svv wrolpi modules' + api-tests-ten: + docker: + - image: cimg/python:3.10 + - image: cimg/postgres:14.1 + environment: + POSTGRES_USER: postgres + POSTGRES_DB: wrolpi + POSTGRES_PASSWORD: "wrolpi" + steps: + - checkout + - run: sudo apt-get update + - run: sudo apt-get install -y ffmpeg texlive-latex-base texlive-latex-extra + - run: + name: Install Requirements + command: | + python3 -m venv venv + . venv/bin/activate + pip install -r requirements.txt + - run: + command: './venv/bin/pytest -svv wrolpi modules' -# Invoke jobs via workflows -# See: https://circleci.com/docs/2.0/configuration-reference/#workflows workflows: - say-hello-workflow: + wrolpi-api-tests: jobs: - - say-hello + - api-tests-eight + - api-tests-nine + - api-tests-ten diff --git a/.gitignore b/.gitignore index 9dbc1483..a3c1297f 100644 --- a/.gitignore +++ b/.gitignore @@ -105,9 +105,10 @@ venv.bak/ # intellij .idea/ -# example videos +# example files test/videos test/archive +test/map # docker configs test/config @@ -119,6 +120,7 @@ docker/archive/package-lock.json # open street map files *.pbf +mapnik.xml # docker override docker-compose.override.yml diff --git a/50x.html b/50x.html index 2d1cf8de..c0371e9a 100644 --- a/50x.html +++ b/50x.html @@ -21,7 +21,28 @@
You can view the media directory by clicking here
+You can view the media directory by navigating to /media
+ +The map may be available by navigating to port 8084
+ +