Merge pull request #299 from cmu-delphi/release/v2.2.0

Release v2.2.0

Author: krivard

.github/release-drafter.yml

@@ -4,17 +4,21 @@ categories:
   - title: "📚 Content Changes"
     labels:
       - "blog"
-      - "documentation"
+      - "content"
   - title: "🚀 Features"
     labels:
       - "enhancement"
       - "feature"
   - title: "🐛 Bugs Fixes"
     labels:
       - "bug"
+  - title: "📕 Documentation"
+    labels:
+      - "documentation"
   - title: "🧰 Development"
     labels:
       - "chore"
+      - "documentation"
 change-template: "- #$NUMBER $TITLE"
 change-title-escapes: '\<*_&`#@'
 template: |

.github/workflows/blog.yaml

@@ -5,7 +5,7 @@ on:
     paths: # run only when an Rmd file changes
       - "**.Rmd"
       - "environment.yml"
-      - ".github/workflows/ci.yaml"
+      - ".github/workflows/blog.yaml"
 
 jobs:
   build:

.github/workflows/ci.yaml

@@ -33,8 +33,8 @@ jobs:
 
   image:
     needs: build
-    # only on tags and dev branch
-    if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/dev'
+    # only on main and dev branch
+    if: startsWith(github.ref, 'refs/heads/main') || github.ref == 'refs/heads/dev'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
@@ -55,29 +55,29 @@ jobs:
         run: |
           baseRef="${GITHUB_REF#*/}"
           imageTag="${baseRef#*/}"
+          if [ "$imageTag" = "main" ] ; then
+            imageTag="latest"
+          fi
           echo "::set-output name=tag::$imageTag"
           echo "::set-output name=repo::ghcr.io/${{ github.repository }}"
-      - name: Push Image Tag
+      - name: Push Dev Tag
+        if: startsWith(github.ref, 'refs/heads/dev')
         run: |
           docker tag repo ${{ steps.tagname.outputs.repo }}:${{ steps.tagname.outputs.tag }}
           docker push ${{ steps.tagname.outputs.repo }}:${{ steps.tagname.outputs.tag }}
+      - name: Extract version
+        if: startsWith(github.ref, 'refs/heads/main')
+        id: extract_version
+        run: node -pe "'::set-output name=version::' + require('./package.json').version"
+      - name: Push Version Tag Tag
+        if: startsWith(github.ref, 'refs/heads/main')
+        run: |
+          docker tag repo ${{ steps.tagname.outputs.repo }}:v{{ steps.extract_version.outputs.version }}
+          docker push ${{ steps.tagname.outputs.repo }}:v{{ steps.extract_version.outputs.version }}
       - name: Trigger Webhook
         run: |
           # trigger a webhook update
           curl -H "Authorization: Bearer ${{ secrets.DELPHI_DEPLOY_WEBHOOK_TOKEN }}" \
                -X POST ${{ secrets.DELPHI_DEPLOY_WEBHOOK_URL }} \
                -H "Content-Type: application/x-www-form-urlencoded" \
                -d "repository=${{ steps.tagname.outputs.repo }}&tag=${{ steps.tagname.outputs.tag }}"
-      - name: Push Latest Tag
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: |
-          docker tag repo ${{ steps.tagname.outputs.repo }}:latest
-          docker push ${{ steps.tagname.outputs.repo }}:latest
-      - name: Trigger Latest Webhook
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: |
-          # trigger a webhook update
-          curl -H "Authorization: Bearer ${{ secrets.DELPHI_DEPLOY_WEBHOOK_TOKEN }}" \
-               -X POST ${{ secrets.DELPHI_DEPLOY_WEBHOOK_URL }} \
-               -H "Content-Type: application/x-www-form-urlencoded" \
-               -d "repository=${{ steps.tagname.outputs.repo }}&tag=latest"

.gitignore

@@ -13,3 +13,5 @@
 .DS_Store
 *.zip
 *.tgz
+.Rhistory
+*.log

.prettierignore

@@ -30,6 +30,7 @@
 *.jpeg
 *.ico
 *.bib
+*.xcf
 /themes/delphi/layouts/partials/webp-image.html
 /themes/delphi/layouts/shortcodes/apireflink.html
 /themes/delphi/layouts/shortcodes/reflink.html

README.md

@@ -1,9 +1,11 @@
 # Delphi Website
 
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delpih/www-main)
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delphi/www-main)
 
 
-Delphi's homepage at https://cmu-delphi-main.netlify.app/
+The current stable `main` version is deployed at https://delphi.cmu.edu and https://cmu-delphi-main.netlify.app/.
+
+The next `dev` version is deployed at https://staging.delphi.cmu.edu/ and https://dev--cmu-delphi-main.netlify.app/.
 
 This site is based on [Hugo](https://gohugo.io) and uses [Prettier](https://prettier.io) for formatting.
 
@@ -47,16 +49,9 @@ In RMarkdown things are slightly more different since the R Markdown parser is u
 
 ```
 
-### Data
-
-In addition, there in the `/data` directory there are the following listings in YAML syntax
-
-- `authors.yaml` list of blog authors referenced in the `authors` field in blog posts. This list is used to generated the author information at the end of a blog post
-- `supporters.yaml` list of supporters/collaborators
-
 ## Development Environment
 
-One click: [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delpih/www-main)
+One click: [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/cmu-delphi/www-main)
 
 ### Web Editor Only
 
@@ -91,7 +86,7 @@ In order to convert the Rmd files to HTML files for Hugo you also need to:
    - `local=TRUE` similar to `-D` to process draft files
    - `run_hugo=FALSE` to manually run hugo
    - `build_rmd=TRUE` force a (re)build of the Rmd pages
-1. Run blogdown to convert a single file to HTML: `Rscript -e 'blogdown::build_site(local=TRUE, run_hugo=FALSE, build_rmd="content/blog/<NAME>.Rmd")'`
+1. Run blogdown to convert a single file to HTML: `Rscript -e 'blogdown::build_site(local=TRUE, run_hugo=FALSE, build_rmd="content/blog/<NAME>.Rmd")'` where `<NAME>` should be replaced by the name of the Rmd file.
 1. Alternatively, run `npm run build:blog`
 1. Run Hugo server as usual
 
@@ -108,12 +103,16 @@ This simplifies the deployment and ensures that we have a blog post even when th
 
 ### Release Process
 
-The release process is based on [release-it](https://github.com/release-it/release-it). To create a release, run
-
-1. create/checkout the release branch `release` and push to origin
-1. run `npm run release` and publish the release
-1. create a PR that merges the `release` branch in the `main` branch
-1. create a PR that merges the `main` branch back into the `dev` branch
-
-Then go to the release page and update short description of the changes made.
+The release consists of multiple steps which can be all done via the GitHub website:
+
+1. Go to [create_release GitHub Action](https://github.com/cmu-delphi/www-main/actions/workflows/create_release.yml) and click the `Run workflow` button. Enter the next version number or one of the magic keywords (patch, minor, major) and hit the green `Run workflow` button.
+1. The action will prepare a new release and will end up with a new [Pull Request](https://github.com/cmu-delphi/www-main/pulls)
+1. Let the code owner review the PR and its changes and let the CI check whether everything builds successfully
+1. Once approved and merged, another GitHub action job starts which automatically will
+   1. create a git tag
+   1. create another [Pull Request](https://github.com/cmu-delphi/www-main/pulls) to merge the changes back to the `dev` branch
+   1. create a [GitHub release](https://github.com/cmu-delphi/www-main/releases) with automatically derived release notes
+   1. create docker image and the production system will be notified to pull this update
+1. Once the jobs are completed the new release should be available at https://delphi.cmu.edu within minutes.
+1. Done
 

config.toml

@@ -29,7 +29,12 @@ relativeURLs = false
     parent = "about"
     name = "Publications"
     url = "/about/publications"
-    weight = 3
+    weight = 4
+[[menu.main]]
+    parent = "about"
+    name = "News"
+    url = "/about/news"
+    weight = 4
 [[menu.main]]
     identifier = "covidcast"
     name = "COVIDcast"
@@ -71,6 +76,11 @@ relativeURLs = false
     name = "Survey Results"
     url = "/covidcast/survey-results"
     weight = 51
+[[menu.main]]
+    parent = "covidcast"
+    name = "Indicator Status Overview"
+    url = "/covidcast/indicator-status"
+    weight = 60
 [[menu.main]]
     parent = "covidcast"
     name = "Export Data"
@@ -122,4 +132,4 @@ relativeURLs = false
     feedbackDelayMin = 45  # in sec
     feedbackDelayMax = 180 # in sec
     feedbackDuration = 60  # show it for 60sec
-    highlightLinks = "/covidcast/,/covidcast/summary,/covidcast/indicator,/signals-dashboard/,/forecast-eval/"
+    highlightLinks = "/covidcast/,/covidcast/summary,/covidcast/indicator,/covidcast/indicator-status,/forecast-eval/"

content/about/_index.md

@@ -1,6 +1,25 @@
 ---
 title: Delphi Research Group
 layout: about
+
+collaborators:
+- name: Amazon
+  group: collaborator
+- name: CDC
+  group: collaborator
+- name: Change Healthcare
+  group: collaborator
+- name: Defense Threat Reduction Agency
+  group: collaborator
+- name: Facebook
+  group: collaborator
+- name: Uptake
+  group: collaborator
+- name: Optum
+  group: collaborator
+- name: Google.org
+  group: sponsor
+
 ---
 
 ### Who are we?

content/about/news/_index.md

@@ -0,0 +1,7 @@
+---
+title: News from the Delphi Team
+linkTitle: News
+layout: single
+---
+
+{{<news>}}