Skip to content

Commit 61100fe

Browse files
committed
wipe out master branch, point to dev/prod
- master isn't used anywhere, so to prevent accidental commits, it's being wiped out except for license and readme - the readme has been updated to explain and link to the dev and prod branches, which is where all the code is
1 parent f15b7a2 commit 61100fe

File tree

127 files changed

+31
-19892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+31
-19892
lines changed

README.md

+31-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,38 @@
11
# Status
22

3-
[![Deploy Status](https://delphi.midas.cs.cmu.edu/~automation/public/github_deploy_repo/badge.php?repo=cmu-delphi/www-crowdcast)](#)
3+
[![Deploy Status](https://delphi.midas.cs.cmu.edu/~automation/public/github_deploy_repo/badge.php?repo=cmu-delphi/www-epicast)](#)
44

55
# About
66

7-
The Crowdcast website for collecting flu forecasts.
7+
The Crowdcast website for collecting flu forecasts. (Previously known as
8+
Epicast.)
89

9-
The site is live at:
10-
- https://delphi.cmu.edu/crowdcast
10+
The site is live at https://delphi.cmu.edu/crowdcast.
1111

12-
A live demo is available at http://demo.epicast.net/ (User ID is `00000000`)
12+
# Branches
13+
14+
The website is deployed to two separate environments: `dev` and `prod`. The
15+
code for those environments is kept in the
16+
[`dev`](https://github.com/cmu-delphi/www-epicast/tree/dev) and
17+
[`prod`](https://github.com/cmu-delphi/www-epicast/tree/prod) branches,
18+
respectively.
19+
20+
## `dev` branch
21+
22+
The `dev` branch is deployed to a Delphi-internal development environment where
23+
we can iterate quickly without worry of breaking the production site.
24+
25+
## `prod` branch
26+
27+
The `prod` branch is deployed to a public-facing production environment. It
28+
should contain only tested and reliable code.
29+
30+
## process
31+
32+
Changes are selectively merged into `prod` from `dev` after testing. However,
33+
**`prod` should not be updated while a forecasting round is active** (i.e.
34+
Friday through Monday), except in case of a critical bugfix.
35+
36+
In any case, all code commits to `prod` should only consist of merges from
37+
`dev`, rather than direct commits. (An exception to this is configuration,
38+
which differs between environments.)

deploy.json

-72
This file was deleted.

site/.htaccess

-9
This file was deleted.

site/FAQ.php

-85
This file was deleted.

0 commit comments

Comments
 (0)