Merge branch 'master' into responsive-navbar-testing

OSU-Sustainability-Office · Aug 24, 2023 · 0ab97e5 · 0ab97e5
2 parents cffd0f0 + 9fbc72b
commit 0ab97e5
Show file tree

Hide file tree

Showing 3 changed files with 639 additions and 434 deletions.
diff --git a/.github/workflows/test-build-s3.yml b/.github/workflows/test-build-s3.yml
@@ -1,9 +1,8 @@
 name: S3 Test Build
 on:
- push:
- branches-ignore:
+ pull_request:
+ branches:
  - master
- - gh-pages
 
 jobs:
  unit-tests:

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This Energy Dashboard has been developed by the Oregon State University Sustaina
 
 ### Testing Locally
 
-We recommend setting up `nvm` to set your node installation to version 16 (`nvm use 16`).
+We recommend setting up `nvm` to set your node installation to version 18 (`nvm use 18`).
 
 Running `npm run serve` will run the front-end locally.