Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #43

Merged
merged 6 commits into from
Oct 18, 2023
Merged

Dev #43

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
flake8
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install libgdal-dev
sudo apt-get install -y libsqlite3-mod-spatialite
export CPLUS_INCLUDE_PATH=/usr/include/gdal
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/gitlab_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: trigger gitlab job

on:
workflow_run:
workflows: ["Django CI"]
types:
- completed
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: trigger Job
run: |
curl -X POST -fail -F token=${{secrets.TOKEN}} -F ref=main https://git.uni-jena.de/api/v4/projects/3567/trigger/pipeline
17 changes: 0 additions & 17 deletions .github/workflows/gitlab_depoy.yml

This file was deleted.

4 changes: 2 additions & 2 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@
# STATIC_URL = SUBDIR+'/static/'
# https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
STATICFILES_DIRS = (
os.path.join(ROOT_DIR, "static"),
os.path.join(os.path.dirname(ROOT_DIR), 'node_modules'),
os.path.join(APPS_DIR, "static"),
# os.path.join(os.path.dirname(ROOT_DIR), 'node_modules'),
)
# https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders
STATICFILES_FINDERS = [
Expand Down
Loading