Merge pull request #132 from GSA/fix-deployment-issues

Fixes issues with cg deploy

.github/workflows/commit.yml

@@ -79,13 +79,17 @@ jobs:
       - name: Install node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "package.json"
+          node-version-file: "app/static/package.json"
       - name: Build static assets
         shell: bash
         run: |
-          cd app/static
-          npm ci
-          npm run build
+            cd app/static
+            npm ci
+            npm run build
+      - name: Set up Python ${{ env.PY_VERSION }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PY_VERSION }}
       - name: Install Poetry
         uses: abatilo/actions-poetry@v2
         with:
@@ -99,7 +103,7 @@ jobs:
       - name: deploy DHL
         uses: cloud-gov/cg-cli-tools@main
         with:
-          command: cf push --vars-file vars.development.yml --strategy rolling --no-wait
+          command: cf push datagov-harvest-admin --vars-file vars.development.yml --strategy rolling --no-wait && cf push datagov-harvest-runner --vars-file vars.development.yml --strategy rolling --no-wait
           cf_org: gsa-datagov
           cf_space: ${{vars.ENVIRONMENT_NAME}}
           cf_username: ${{secrets.CF_SERVICE_USER}}

app/forms.py

@@ -1,5 +1,5 @@
-import re
 import os
+import re
 
 from flask_wtf import FlaskForm
 from wtforms import SelectField, StringField, TextAreaField

app/routes.py

@@ -1,3 +1,4 @@
+import csv
 import json
 import logging
 import os
@@ -6,7 +7,6 @@
 import uuid
 from functools import wraps
 from io import StringIO
-import csv
 
 import click
 import jwt
@@ -17,12 +17,12 @@
 from flask import (
     Blueprint,
     flash,
+    make_response,
     redirect,
     render_template,
     request,
     session,
     url_for,
-    make_response,
 )
 from jinja2_fragments.flask import render_block