Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
drcongo committed Aug 16, 2024
2 parents 21c3684 + cf3f5f4 commit a0262e8
Show file tree
Hide file tree
Showing 10 changed files with 442 additions and 402 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
ssh-keyscan github.com >> ~/.ssh/known_hosts
ssh-keyscan $IP_STAGING >> ~/.ssh/known_hosts
ssh-add - <<< "${{ secrets.DEPLOY_KEY_PRIVATE }}"
git remote add staging ssh://deploy@$IP_STAGING/srv/repos/openownership.org.git
git remote add staging ssh://deploy@$IP_STAGING/srv/repos/openownership.git
git push staging staging -f
sentry_release_staging:
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
ssh-keyscan github.com >> ~/.ssh/known_hosts
ssh-keyscan $IP_PRODUCTION >> ~/.ssh/known_hosts
ssh-add - <<< "${{ secrets.DEPLOY_KEY_PRIVATE }}"
git remote add production ssh://deploy@$IP_PRODUCTION/srv/repos/openownership.org.git
git remote add production ssh://deploy@$IP_PRODUCTION/srv/repos/openownership.git
git push production main -f
sentry_release_prod:
Expand Down
4 changes: 2 additions & 2 deletions app/config/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@

MEDIA_ROOT = 'staging/media/'
MEDIA_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_ROOT}'
WAGTAIL_CACHE = False

#WAGTAIL_CACHE = False
#CACHEOPS_ENABLED = False
Loading

0 comments on commit a0262e8

Please sign in to comment.