Skip to content

Commit 9654e18

Browse files
authored
Merge pull request #2 from opengisch/fix_actions
Fix GitHub actions
2 parents f144724 + b9b2f25 commit 9654e18

File tree

2 files changed

+5
-42
lines changed

2 files changed

+5
-42
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ STORAGE_ACCESS_KEY_ID=minio_access_key
77
STORAGE_SECRET_ACCESS_KEY=minio_secret_key
88
STORAGE_BUCKET_NAME=qfieldcloud-local
99
STORAGE_REGION_NAME=
10-
STORAGE_ENDPOINT_URL=http://s3:9000
10+
STORAGE_ENDPOINT_URL=http://localhost:9000
1111
MINIO_PORT=9000
1212

1313
WEB_HTTP_PORT=80

.github/workflows/test.yml

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,10 @@ jobs:
2222
run: |
2323
pipenv install pre_commit
2424
pipenv run python -m pre_commit run --all-files
25-
- name: Create .env file from secret
26-
uses: SpicyPizza/create-envfile@v1
27-
with:
28-
envkey_DEBUG: 1
29-
envkey_QFIELDCLOUD_HOST: "localhost"
30-
envkey_SECRET_KEY: ${{ secrets.SECRET_KEY }}
31-
envkey_WEB_HTTP_PORT: 80
32-
envkey_WEB_HTTPS_PORT: 443
33-
envkey_POSTGRES_USER: "qfieldcloud_test_db_admin"
34-
envkey_POSTGRES_PASSWORD: ${{ secrets.SQL_PASSWORD }}
35-
envkey_POSTGRES_DB: "qfieldcloud_test_db"
36-
envkey_POSTGRES_HOST: "db"
37-
envkey_POSTGRES_PORT: 5432
38-
envkey_HOST_POSTGRES_PORT: 5433
39-
envkey_DJANGO_ALLOWED_HOSTS: "localhost 127.0.0.1 [::1]"
40-
envkey_DJANGO_SETTINGS_MODULE: "qfieldcloud.settings"
41-
envkey_STORAGE_ACCESS_KEY_ID: "minio_access_key"
42-
envkey_STORAGE_SECRET_ACCESS_KEY: "minio_secret_key"
43-
envkey_STORAGE_BUCKET_NAME: "qfieldcloud-gh-action"
44-
envkey_STORAGE_REGION_NAME: ""
45-
envkey_STORAGE_ENDPOINT_URL: "http://localhost:9000"
46-
envkey_MINIO_PORT: 9000
47-
envkey_REDIS_HOST: "redis"
48-
envkey_REDIS_PASSWORD: "reeeeeedissssssss"
49-
envkey_REDIS_PORT: 6379
50-
envkey_GEODB_HOST: "geodb"
51-
envkey_GEODB_USER: "postgres"
52-
envkey_GEODB_PASSWORD: ${{ secrets.GEODB_PASSWORD }}
53-
envkey_GEODB_DB: "postgres"
54-
envkey_GEODB_PORT: 5432
55-
envkey_CADDY_ACME_CA: "https://acme-staging-v02.api.letsencrypt.org/directory"
56-
envkey_ACCOUNT_EMAIL_VERIFICATION: "optional"
57-
envkey_EMAIL_HOST: "smtp4dev"
58-
envkey_EMAIL_USE_TLS: False
59-
envkey_EMAIL_PORT: 25
60-
envkey_EMAIL_HOST_USER: ""
61-
envkey_EMAIL_HOST_PASSWORD: ""
62-
envkey_LOG_DIRECTORY: "/tmp/"
63-
envkey_TMP_DIRECTORY: "/tmp/"
64-
envkey_COMPOSE_PROJECT_NAME: "qfc"
65-
file_name: ".env"
25+
- name: Export the env variables file
26+
run: |
27+
cp .env.example .env
28+
export $(egrep -v '^#' .env | xargs)
6629
- name: Build and run docker containers
6730
run: |
6831
docker-compose up -d --build

0 commit comments

Comments
 (0)