Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync staging with develop #499

Merged
merged 16 commits into from
Oct 25, 2024
Merged

Sync staging with develop #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8a27fa0
Add playwright and configure auth and initial tests
courtneymyers Oct 23, 2024
2b9dbcc
Add playwright test for viewing 2024 rebate form submissions and fix …
courtneymyers Oct 24, 2024
486916d
Update dashboard test titles
courtneymyers Oct 24, 2024
24621ac
Merge pull request #494 from USEPA/feature/add-playwright
courtneymyers Oct 24, 2024
12e97f3
Update manifest-production.yml instances and memory fields to reflect…
courtneymyers Oct 24, 2024
2b1f524
Update CSB_REBATE_YEAR env value in dev and stating GitHub Action wor…
courtneymyers Oct 24, 2024
d212ded
Update GitHub Action workflow files to pass production flag to npm in…
courtneymyers Oct 24, 2024
a1547b9
Merge pull request #495 from USEPA/feature/update-config-files
courtneymyers Oct 24, 2024
09ebfbf
Remove production flag from npm install of client app dependencies in…
courtneymyers Oct 24, 2024
f46a61c
Update GitHub Action workflows steps and comments (text/documentation…
courtneymyers Oct 24, 2024
f5710fb
Merge pull request #496 from USEPA/feature/update-github-actions-work…
courtneymyers Oct 24, 2024
5dd0d03
Add Salesforce attributes to queried BAP data types, fix incorrect ty…
courtneymyers Oct 25, 2024
df2a8d0
Update value passed in new 2023 PRF as the _bap_applicant_organizatio…
courtneymyers Oct 25, 2024
ab5945a
Merge pull request #497 from USEPA/feature/update-applicant-organizat…
courtneymyers Oct 25, 2024
6ef8850
Update epa stylesheet to latest version
courtneymyers Oct 25, 2024
f1255cd
Merge pull request #498 from USEPA/feature/update-epa-stylesheet
courtneymyers Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
CSB_REBATE_YEAR: 2023
CSB_REBATE_YEAR: 2024
CSB_2022_FRF_OPEN: true
CSB_2022_PRF_OPEN: true
CSB_2022_CRF_OPEN: true
Expand Down Expand Up @@ -96,11 +96,11 @@ jobs:
run: echo "//pkg.form.io/:_authToken=${FORMIO_PKG_AUTH_TOKEN}" > .npmrc
working-directory: app/client

- name: Install front-end dependencies
- name: Install client app dependencies
run: npm install
working-directory: app/client

- name: Build front-end files and move to server
- name: Build client app and move files to server app
run: |
VITE_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
VITE_CLOUD_SPACE="$CLOUD_SPACE" \
Expand All @@ -122,7 +122,7 @@ jobs:
cf auth "$CF_USER_DEV" "$CF_PASSWORD_DEV"
cf target -o "$CF_ORG" -s "$CF_SPACE"

- name: Set application-level variables
- name: Set application level variables
run: |
cf set-env $APP_NAME "CLOUD_SPACE" "$CLOUD_SPACE" > /dev/null
cf set-env $APP_NAME "SERVER_URL" "$SERVER_URL" > /dev/null
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
run: aws s3api put-bucket-cors --bucket $S3_PUBLIC_BUCKET --cors-configuration file://s3CORS.json
working-directory: app/server/app/config

# Now that front-end is built in server/dist, only push server dir to Cloud.gov
# Now that client is built and included in server app, only push server app to Cloud.gov
- name: Deploy application to Cloud.gov
run: cf push $APP_NAME --strategy rolling -f ../manifest-dev.yml -p . -t 180
working-directory: app/server
4 changes: 2 additions & 2 deletions .github/workflows/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
restore-keys: v1-npm-server-deps-

- name: Install server app dependencies
run: npm install
run: npm install --production
working-directory: app/server

- name: Cache client app node modules
Expand All @@ -63,7 +63,7 @@ jobs:
run: npm install
working-directory: app/client

- name: Build client app
- name: Build client app and move files to server app
run: |
VITE_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
VITE_CLOUD_SPACE="$CLOUD_SPACE" \
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
CSB_REBATE_YEAR: 2023
CSB_REBATE_YEAR: 2024
CSB_2022_FRF_OPEN: true
CSB_2022_PRF_OPEN: true
CSB_2022_CRF_OPEN: true
Expand Down Expand Up @@ -96,11 +96,11 @@ jobs:
run: echo "//pkg.form.io/:_authToken=${FORMIO_PKG_AUTH_TOKEN}" > .npmrc
working-directory: app/client

- name: Install front-end dependencies
- name: Install client app dependencies
run: npm install
working-directory: app/client

- name: Build front-end files and move to server
- name: Build client app and move files to server app
run: |
VITE_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
VITE_CLOUD_SPACE="$CLOUD_SPACE" \
Expand All @@ -122,7 +122,7 @@ jobs:
cf auth "$CF_USER_STAGING" "$CF_PASSWORD_STAGING"
cf target -o "$CF_ORG" -s "$CF_SPACE"

- name: Set application-level variables
- name: Set application level variables
run: |
cf set-env $APP_NAME "CLOUD_SPACE" "$CLOUD_SPACE" > /dev/null
cf set-env $APP_NAME "SERVER_URL" "$SERVER_URL" > /dev/null
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
run: aws s3api put-bucket-cors --bucket $S3_PUBLIC_BUCKET --cors-configuration file://s3CORS.json
working-directory: app/server/app/config

# Now that front-end is built in server/dist, only push server dir to Cloud.gov
# Now that client is built and included in server app, only push server app to Cloud.gov
- name: Deploy application to Cloud.gov
run: cf push $APP_NAME --strategy rolling -f ../manifest-staging.yml -p . -t 180
working-directory: app/server
2 changes: 2 additions & 0 deletions app/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
TEST_USERNAME=
TEST_PASSWORD=
6 changes: 6 additions & 0 deletions app/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules/
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
/playwright/.auth/
Loading