Skip to content

Commit

Permalink
Merge branch 'handle-resume' of github.com:cds-snc/platform-forms-cli…
Browse files Browse the repository at this point in the history
…ent into handle-resume
  • Loading branch information
timarney committed Feb 3, 2025
2 parents 903299d + ca6baf1 commit 5a1802a
Show file tree
Hide file tree
Showing 13 changed files with 180 additions and 144 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Initialize CodeQL
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
uses: github/codeql-action/autobuild@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
with:
category: "/language:${{ matrix.language }}"
4 changes: 2 additions & 2 deletions .github/workflows/cypress-component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout
uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
- name: Node.JS Setup
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version-file: .nvmrc

Expand All @@ -34,7 +34,7 @@ jobs:
run: yarn workspaces focus gcforms flag_initialization

- name: Cypress Component Tests
uses: cypress-io/github-action@b86ab8d33218c786a7c2d17dfea9724eb8aa8b6b # v6.7.9
uses: cypress-io/github-action@7271bed2a170d73c0b08939cd192db51a1c46c50 # v6.7.10
with:
# we have already installed all dependencies above
install: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Checkout
uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
- name: Node.JS Setup
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version-file: .nvmrc

Expand All @@ -69,7 +69,7 @@ jobs:
run: yarn workspaces focus gcforms flag_initialization

- name: Cypress Tests
uses: cypress-io/github-action@b86ab8d33218c786a7c2d17dfea9724eb8aa8b6b # v6.7.9
uses: cypress-io/github-action@7271bed2a170d73c0b08939cd192db51a1c46c50 # v6.7.10
with:
# we have already installed all dependencies above
install: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-vulnerability-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- name: Login to Staging Amazon ECR
id: login-ecr-staging
uses: aws-actions/amazon-ecr-login@7aa1cd875dcfeb84248ffef10fa0b240c789ff56
uses: aws-actions/amazon-ecr-login@21a7588699d87a47d51abd55e077cb0fcf66fe7c

- name: Docker vulnerability scan
uses: cds-snc/security-tools/.github/actions/docker-scan@34794baf2af592913bb5b51d8df4f8d0acc49b6f # v3.2.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Node.JS Setup
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version-file: .nvmrc

Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
steps:
- uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
- name: Node.JS Setup
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version-file: .nvmrc

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
- name: Node.JS Setup
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version-file: .nvmrc
- name: Yarn update to V4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-build-push-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- name: Login to Production Amazon ECR
id: login-ecr-production
uses: aws-actions/amazon-ecr-login@7aa1cd875dcfeb84248ffef10fa0b240c789ff56
uses: aws-actions/amazon-ecr-login@21a7588699d87a47d51abd55e077cb0fcf66fe7c

- name: Tag Images for Production
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Login to Amazon ECR
id: login-ecr
# v1 as of Jan 28 2021
uses: aws-actions/amazon-ecr-login@7aa1cd875dcfeb84248ffef10fa0b240c789ff56
uses: aws-actions/amazon-ecr-login@21a7588699d87a47d51abd55e077cb0fcf66fe7c

- name: Download Form Viewer task definition
id: download-taskdef-form-viewer
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Render image for form viewer service
id: taskdef-form-viewer
# v1.0.10
uses: aws-actions/amazon-ecs-render-task-definition@db9541038d2aa8af7d76e233b87c36496af54346
uses: aws-actions/amazon-ecs-render-task-definition@1048d8f8eb80d018c1bed7b5e3b252148bd6dfe5
with:
task-definition: form_viewer.json
container-name: ${{ steps.download-taskdef-form-viewer.outputs.container_name }}
Expand All @@ -71,7 +71,7 @@ jobs:
- name: Deploy image for Form Viewer
timeout-minutes: 10
# v1.4.11
uses: aws-actions/amazon-ecs-deploy-task-definition@4678db81fea83218b38231cf0d35af83b1709cce
uses: aws-actions/amazon-ecs-deploy-task-definition@67a620cba2e6cae43356b56e67f0d324e1c38dd4
with:
task-definition: ${{ steps.taskdef-form-viewer.outputs.task-definition }}
service: form-viewer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging-build-push-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Login to Staging Amazon ECR
id: login-ecr-staging
uses: aws-actions/amazon-ecr-login@7aa1cd875dcfeb84248ffef10fa0b240c789ff56
uses: aws-actions/amazon-ecr-login@21a7588699d87a47d51abd55e077cb0fcf66fe7c

- name: Tag Images for Staging
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Login to Amazon ECR
id: login-ecr
# v1 as of Jan 28 2021
uses: aws-actions/amazon-ecr-login@7aa1cd875dcfeb84248ffef10fa0b240c789ff56
uses: aws-actions/amazon-ecr-login@21a7588699d87a47d51abd55e077cb0fcf66fe7c

- name: Download Form Viewer task definition
id: download-taskdef-form-viewer
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Render image for form viewer service
id: taskdef-form-viewer
# v1.0.10
uses: aws-actions/amazon-ecs-render-task-definition@db9541038d2aa8af7d76e233b87c36496af54346
uses: aws-actions/amazon-ecs-render-task-definition@1048d8f8eb80d018c1bed7b5e3b252148bd6dfe5
with:
task-definition: form_viewer.json
container-name: ${{ steps.download-taskdef-form-viewer.outputs.container_name }}
Expand All @@ -72,7 +72,7 @@ jobs:
- name: Deploy image for Form Viewer
timeout-minutes: 10
# v1.4.11
uses: aws-actions/amazon-ecs-deploy-task-definition@4678db81fea83218b38231cf0d35af83b1709cce
uses: aws-actions/amazon-ecs-deploy-task-definition@67a620cba2e6cae43356b56e67f0d324e1c38dd4
with:
task-definition: ${{ steps.taskdef-form-viewer.outputs.task-definition }}
service: form-viewer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vitest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
- name: Node.JS Setup
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version-file: .nvmrc
- name: Yarn update to V4
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"lodash.set": "4.3.2",
"lodash.unset": "4.5.2",
"markdown-to-jsx": "7.5.0",
"next": "15.1.5",
"next": "15.1.6",
"next-auth": "5.0.0-beta.25",
"node-fetch": "^3.3.2",
"pino": "9.1.0",
Expand Down Expand Up @@ -144,7 +144,7 @@
"@types/node": "^20.11.6",
"@types/node-fetch": "^2.6.9",
"@types/pg": "^8.10.9",
"@types/react": "19.0.7",
"@types/react": "19.0.8",
"@types/react-dom": "19.0.3",
"@types/unorm": "^1",
"@types/uuid": "^8.3.4",
Expand All @@ -163,7 +163,7 @@
"cypress-terminal-report": "^7.1.0",
"cypress-wait-until": "^3.0.2",
"eslint": "^9.17.0",
"eslint-config-next": "15.1.5",
"eslint-config-next": "15.1.6",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-tailwindcss": "^3.17.5",
"husky": "^9.0.10",
Expand Down Expand Up @@ -198,7 +198,7 @@
],
"packageManager": "[email protected]",
"resolutions": {
"@types/react": "19.0.7",
"@types/react": "19.0.8",
"@types/react-dom": "19.0.3"
}
}
Loading

0 comments on commit 5a1802a

Please sign in to comment.