Merge pull request #4179 from GSA-TTS/main

.github/workflows/deploy-development.yml

@@ -1,85 +1,88 @@
----
-name: Deploy to Development and Management Environment
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  # ensure that every time a push to main occurs, the container is built and published to ghcr
-  build-container:
-    uses: ./.github/workflows/build-docker-container.yml
-    secrets: inherit
-    permissions:
-      contents: read
-      packages: write
-    with:
-      docker-name: fac
-      image-name: web-container
-      repo-name: gsa-tts/fac
-      work-dir: ./backend
-
-  testing:
-    needs: [build-container]
-    uses: ./.github/workflows/testing-from-ghcr.yml
-    secrets: inherit
-
-  linting:
-    uses: ./.github/workflows/linting.yml
-    secrets: inherit
-
-  # deploy to Dev & Management spaces
-  deploy-infrastructure-dev:
-    name: Deploy infrastructure (development)
-    needs:
-      - testing
-    uses: ./.github/workflows/terraform-apply-env.yml
-    with:
-      environment: "dev"
-      autoapprove: false
-    secrets: inherit
-
-  deploy-infastructure-meta:
-    name: Deploy infrastructure (meta)
-    needs:
-      - testing
-    uses: ./.github/workflows/terraform-apply-env.yml
-    with:
-      environment: "meta"
-      autoapprove: false
-    secrets: inherit
-
-  new-relic-record:
-    name: Record deployment to New Relic
-    needs:
-      - deploy-infrastructure-dev
-    uses: ./.github/workflows/new-relic-deployment.yml
-    with:
-      environment: "dev"
-    secrets: inherit
-
-  deploy-dev:
-    name: Deploy application
-    needs:
-      - deploy-infrastructure-dev
-    uses: ./.github/workflows/deploy-application.yml
-    with:
-      environment: "dev"
-    secrets: inherit
-
-  scan-dev-post-deploy:
-    name: ZAP Scan
-    needs:
-      - deploy-dev
-    uses: ./.github/workflows/zap-scan.yml
-    with:
-      url: "https://fac-dev.app.cloud.gov/"
-
-  generate-e2e-test-data:
-    needs:
-      - deploy-dev
-    name:
-    uses: ./.github/workflows/end-to-end-test-data-generator.yml
-    secrets: inherit
-    with:
-      environment: "dev"
+---
+name: Deploy to Development and Management Environment
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '.github/ISSUE_TEMPLATE/**'
+
+jobs:
+  # ensure that every time a push to main occurs, the container is built and published to ghcr
+  build-container:
+    uses: ./.github/workflows/build-docker-container.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+    with:
+      docker-name: fac
+      image-name: web-container
+      repo-name: gsa-tts/fac
+      work-dir: ./backend
+
+  testing:
+    needs: [build-container]
+    uses: ./.github/workflows/testing-from-ghcr.yml
+    secrets: inherit
+
+  linting:
+    uses: ./.github/workflows/linting.yml
+    secrets: inherit
+
+  # deploy to Dev & Management spaces
+  deploy-infrastructure-dev:
+    name: Deploy infrastructure (development)
+    needs:
+      - testing
+    uses: ./.github/workflows/terraform-apply-env.yml
+    with:
+      environment: "dev"
+      autoapprove: false
+    secrets: inherit
+
+  deploy-infastructure-meta:
+    name: Deploy infrastructure (meta)
+    needs:
+      - testing
+    uses: ./.github/workflows/terraform-apply-env.yml
+    with:
+      environment: "meta"
+      autoapprove: false
+    secrets: inherit
+
+  new-relic-record:
+    name: Record deployment to New Relic
+    needs:
+      - deploy-infrastructure-dev
+    uses: ./.github/workflows/new-relic-deployment.yml
+    with:
+      environment: "dev"
+    secrets: inherit
+
+  deploy-dev:
+    name: Deploy application
+    needs:
+      - deploy-infrastructure-dev
+    uses: ./.github/workflows/deploy-application.yml
+    with:
+      environment: "dev"
+    secrets: inherit
+
+  scan-dev-post-deploy:
+    name: ZAP Scan
+    needs:
+      - deploy-dev
+    uses: ./.github/workflows/zap-scan.yml
+    with:
+      url: "https://fac-dev.app.cloud.gov/"
+
+  generate-e2e-test-data:
+    needs:
+      - deploy-dev
+    name:
+    uses: ./.github/workflows/end-to-end-test-data-generator.yml
+    secrets: inherit
+    with:
+      environment: "dev"

.github/workflows/pull-request-checks.yml

@@ -9,6 +9,7 @@ on:
       - '**'
       - '!docs/**'
       - 'docs/bpmn-workflow-models/**'
+      - '!.github/ISSUE_TEMPLATE/**'
   workflow_dispatch: null
 
 jobs:

.gitignore

@@ -116,6 +116,9 @@ ENV/
 env.bak/
 venv.bak/
 
+# Added by MSHD for local development
+backend/my_env
+
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -151,15 +154,6 @@ backend/.idea/
 
 backend/census_historical_migration/data/
 
-# Data loading artifacts
-backend/data_distro/data_to_load/run_logs/Results_*
-backend/data_distro/data_to_load/run_logs/Lines_*
-backend/data_distro/data_to_load/run_logs/Errors_*
-backend/data_distro/data_to_load/run_logs/Exceptions_*
-# And, data people download to load locally
-backend/data_distro/data_to_load/*.txt
-
-
 # Assets
 node_modules/
 backend/static/compiled

backend/package.json

@@ -25,15 +25,15 @@
   "devDependencies": {
     "@4tw/cypress-drag-drop": "^2.2.5",
     "@babel/eslint-parser": "^7.25.1",
-    "@eslint/js": "^9.7.0",
+    "@eslint/js": "^9.9.0",
     "cypress": "^13.13.2",
     "cypress-axe": "^1.5.0",
     "cypress-downloadfile": "^1.2.4",
     "cypress-file-upload": "^5.0.8",
     "cypress-otp": "^1.0.3",
-    "eslint": "^9.8.0",
+    "eslint": "^9.9.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-cypress": "^3.4.0",
+    "eslint-plugin-cypress": "^3.5.0",
     "eslint-plugin-prettier": "^5.2.1",
     "prettier": "^3.3.3",
     "stylelint": "^15.10.1",
@@ -42,7 +42,7 @@
     "stylelint-config-standard-scss": "^11.0.0"
   },
   "dependencies": {
-    "@uswds/uswds": "3.8.1",
+    "@uswds/uswds": "3.8.2",
     "autoprefixer": "^10.4.20",
     "esbuild": "^0.23.0",
     "esbuild-sass-plugin": "3.3.1",