Skip to content

wipe out master branch, point to dev/prod #6

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

Merged
merged 2 commits into from
Apr 24, 2020
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
36 changes: 31 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,38 @@
# Status

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

# About

The Crowdcast website for collecting flu forecasts.
The Crowdcast website for collecting flu forecasts. (Previously known as
Epicast.)

The site is live at:
- https://delphi.cmu.edu/crowdcast
The site is live at https://delphi.cmu.edu/crowdcast.

A live demo is available at http://demo.epicast.net/ (User ID is `00000000`)
# Branches

The website is deployed to two separate environments: `dev` and `prod`. The
code for those environments is kept in the
[`dev`](https://github.com/cmu-delphi/www-epicast/tree/dev) and
[`prod`](https://github.com/cmu-delphi/www-epicast/tree/prod) branches,
respectively.

## `dev` branch

The `dev` branch is deployed to a Delphi-internal development environment where
we can iterate quickly without worry of breaking the production site.

## `prod` branch

The `prod` branch is deployed to a public-facing production environment. It
should contain only tested and reliable code.

## process

Changes are selectively merged into `prod` from `dev` after testing. However,
**`prod` should not be updated while a forecasting round is active** (i.e.
Friday through Monday), except in case of a critical bugfix.

In any case, all code commits to `prod` should only consist of merges from
`dev`, rather than direct commits. (An exception to this is configuration,
which differs between environments.)
72 changes: 0 additions & 72 deletions deploy.json

This file was deleted.

9 changes: 0 additions & 9 deletions site/.htaccess

This file was deleted.

85 changes: 0 additions & 85 deletions site/FAQ.php

This file was deleted.

Loading