Merge pull request #561 from cmu-delphi/sgratzl/ci_auto_dev

Auto merge dev upon release

Author: sgratzl

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 16
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v2
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node3-${{ hashFiles('**/package-lock.json') }}

.github/workflows/release_main.yml

@@ -47,7 +47,7 @@ jobs:
         with:
           node-version: 16
       - name: Cache Node.js modules
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v2
         with:
           path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
           key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}
@@ -75,16 +75,5 @@ jobs:
       - name: Reset dev branch
         run: |
           git fetch origin main:main
-          git reset --hard main
-      - name: Create pull request into dev
-        uses: peter-evans/create-pull-request@v3
-        with:
-          branch: bot/sync-main-dev
-          commit-message: "chore: sync main-dev"
-          base: dev
-          title: "chore: sync main->dev"
-          labels: chore
-          reviewers: krivard
-          # assignees:
-          body: |
-            Syncing Main->Dev.
+          git merge main
+          git push

README.md

@@ -185,7 +185,6 @@ The release consists of multiple steps which can be all done via the GitHub webs
 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.