Merge branch 'develop' into 2996-cat4-err-msgs

raft-tech · Jul 29, 2024 · 034d397 · 034d397
2 parents 15c177a + 128390a
commit 034d397
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/.github/workflows/deploy-on-label.yml b/.github/workflows/deploy-on-label.yml
@@ -58,6 +58,17 @@ jobs:
         STATE=${{ fromJson(steps.get-pr-checks.outputs.data).state }}
         echo "::set-output name=STATE::$STATE"
         echo "Current PR state: $STATE"
+
+    - name: Live Environment Badge
+      uses: schneegans/[email protected]
+      with:
+        auth: ${{ secrets.LIVE_ENV_GIST }}
+        gistID: ded3a260ed8245a5b231ba726b3039df
+        filename: Live-Environments-${{steps.extract-deploy-env.outputs.DEPLOY_ENV}}.json
+        label: ${{steps.extract-deploy-env.outputs.DEPLOY_ENV}}
+        message: "${{ github.head_ref }} - ${{ github.sha }}"
+        color: blue
+
     - name: Circle CI Deployment Trigger
       id: curl-circle-ci
       if: steps.get-pr-state.outputs.STATE == 'success'

diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@ Our vision is to build a new, secure, web-based data reporting system to improve
 |**Frontend Coverage**| [![Codecov-Frontend-Dev](https://codecov.io/gh/raft-tech/TANF-app/branch/develop/graph/badge.svg?flag=dev-frontend)](https://codecov.io/gh/raft-tech/TANF-app?flag=dev-frontend) | [![Codeco-Frontend-HHS](https://codecov.io/gh/HHS/TANF-app/branch/main/graph/badge.svg?flag=main-frontend)](https://codecov.io/gh/HHS/TANF-app?flag=main-frontend)   | [![Codeco-Frontend-HHS](https://codecov.io/gh/HHS/TANF-app/branch/master/graph/badge.svg?flag=master-frontend)](https://codecov.io/gh/HHS/TANF-app?flag=master-frontend) 
 |**Backend Coverage**|  [![Codecov-Backend-Dev](https://codecov.io/gh/raft-tech/TANF-app/branch/develop/graph/badge.svg?flag=dev-backend)](https://codecov.io/gh/raft-tech/TANF-app/branch/develop?flag=dev-backend)|   [![Codecov-Backend-HHS]( https://codecov.io/gh/HHS/TANF-app/branch/main/graph/badge.svg?flag=main-backend)](https://codecov.io/gh/HHS/TANF-app/branch/main?flag=main-backend) |  [![Codecov-Backend-HHS]( https://codecov.io/gh/HHS/TANF-app/branch/master/graph/badge.svg?flag=master-backend)](https://codecov.io/gh/HHS/TANF-app/branch/master?flag=master-backend)
 
+[Link to Current Development Deployments](https://github.com/raft-tech/TANF-app/blob/feat/1860/docs/Technical-Documentation/TDP-environments-README.md#development)
+
 *Due to limitations imposed by Github and occasional slow server response times, some badges may require a page refresh to load.*
 
 *TDP is subject to the **[ACF Privacy Policy](https://www.acf.hhs.gov/privacy-policy)** and **[HHS Vulnerability Disclosure Policy](https://www.hhs.gov/vulnerability-disclosure-policy/index.html)***.

diff --git a/docs/Technical-Documentation/TDP-environments-README.md b/docs/Technical-Documentation/TDP-environments-README.md
@@ -2,11 +2,18 @@
 
 ## Development
 
-| Dev Site | Frontend URL | Backend URL | Purpose |
-| -------- | -------- | -------- | -------- |
-| A11y | https://tdp-frontend-a11y.app.cloud.gov | https://tdp-frontend-a11y.app.cloud.gov/admin/ | Space for accessibility testing |
-| QASP | https://tdp-frontend-qasp.app.cloud.gov | https://tdp-frontend-qasp.app.cloud.gov/admin/ | Space for QASP review |
-| raft | https://tdp-frontend-raft.app.cloud.gov | https://tdp-frontend-raft.app.cloud.gov/admin/ | Space for raft review |
+| Dev Site | Frontend URL | Backend URL | Branch/Commit | Purpose |
+| -------- | -------- | -------- | -------- | -------- |
+| A11y | https://tdp-frontend-a11y.app.cloud.gov | https://tdp-frontend-a11y.app.cloud.gov/admin/ |  | Space for accessibility testing |
+| QASP | https://tdp-frontend-qasp.app.cloud.gov | https://tdp-frontend-qasp.app.cloud.gov/admin/ |  | Space for QASP review |
+| raft | https://tdp-frontend-raft.app.cloud.gov | https://tdp-frontend-raft.app.cloud.gov/admin/ | 
+ | Space for raft review |
+
+![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/andrew-jameson/ded3a260ed8245a5b231ba726b3039df/raw/Live-Environments-raft.json)
+
+![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/andrew-jameson/ded3a260ed8245a5b231ba726b3039df/raw/Live-Environments-a11y.json)
+
+![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/andrew-jameson/ded3a260ed8245a5b231ba726b3039df/raw/Live-Environments-qasp.json)
 
 ### Dependencies
 

diff --git a/scripts/deploy-frontend.sh b/scripts/deploy-frontend.sh
@@ -57,6 +57,7 @@ update_frontend()
     unlink .env.production
     mkdir deployment
 
+
     cp -r build deployment/public
     cp nginx/cloud.gov/buildpack.nginx.conf deployment/nginx.conf
     cp nginx/cloud.gov/locations.conf deployment/locations.conf