Merge branch 'main' into eg-1982-fix-daily-high-low-calc

weather-gov · Nov 7, 2024 · 86c8763 · 86c8763
2 parents 85d2944 + f442aba
commit 86c8763
Show file tree

Hide file tree

Showing 29 changed files with 1,647 additions and 1,108 deletions.
diff --git a/.github/workflows/code-standards.yaml b/.github/workflows/code-standards.yaml
@@ -114,13 +114,16 @@ jobs:
         if: needs.should-test.outputs.yes == 'true'
         uses: actions/checkout@v4
       - name: setup node
+        if: needs.should-test.outputs.yes == 'true'
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: npm
       - name: install dependencies
+        if: needs.should-test.outputs.yes == 'true'
         run: npm ci
       - name: test
+        if: needs.should-test.outputs.yes == 'true'
         run: npm test
       - name: store coverage output
         if: needs.should-test.outputs.yes == 'true'

diff --git a/Makefile b/Makefile
@@ -79,7 +79,7 @@ endif
 
 
 dump-spatial:
-	docker compose exec database mysqldump -udrupal -pdrupal -hdatabase weathergov weathergov_geo_metadata weathergov_geo_states weathergov_geo_counties weathergov_geo_places weathergov_geo_cwas weathergov_geo_zones > spatial-data/dump.mysql
+	docker compose exec database mysqldump -udrupal -pdrupal -hdatabase --no-tablespaces weathergov weathergov_geo_metadata weathergov_geo_states weathergov_geo_counties weathergov_geo_places weathergov_geo_cwas weathergov_geo_zones > spatial-data/dump.mysql
 
 reset-site: reset-site-database pause install-site ## Delete the database and rebuild it from configuration and exported content
 reset-site-database: