Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: CD
on:
push:
branches:
- main
- deploy-prod

schedule:
# Runs "At 00:01. every day" (see https://crontab.guru)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- 'develop'
- 'main'

env:
GITHUB_WORKFLOW: true
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ You can view the live staging site here:
1. **Rebase your branch onto the staging branch:**

```bash
git checkout stage
git checkout deploy-stage
git rebase <branch-you-want-to-deploy>
git push
```
Expand All @@ -98,7 +98,7 @@ You can manually trigger the deployment workflow here:

Deployments will be triggered in 2 ways:

1. Anything pushed to `main` branch will trigger immediate deployment
1. Anything pushed to `deploy-prod` branch will trigger immediate deployment
to configured github io page.
2. Every day at UTC 00:01, deployment will be triggered with
latest data from MapSwipe database.
Expand Down
Loading