Skip to content

Commit

Permalink
Merge branch '10074-bug' of https://github.com/flexion/ef-cms into 10…
Browse files Browse the repository at this point in the history
…466-design-debt
  • Loading branch information
TomElliottFlexion committed Oct 22, 2024
2 parents 7c7204a + 3e7e520 commit dc30641
Show file tree
Hide file tree
Showing 600 changed files with 29,047 additions and 42,179 deletions.
7 changes: 6 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
orbs:
git-shallow-clone: guitarrapc/[email protected]

efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.9
efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.14

parameters:
run_build_and_deploy:
Expand Down Expand Up @@ -128,6 +128,10 @@ jobs:
- run:
name: Setup Blue Green Migration If Needed
command: |
if [ "$DEPLOY_EMPTY_PERSISTENCE" == "true" ]; then
echo "skipping…"
exit 0
fi
./setup-for-blue-green-migration.sh
- run:
no_output_timeout: 20m
Expand Down Expand Up @@ -709,6 +713,7 @@ jobs:
- run:
name: Set Marker to Indicate Data is Finished Gluing
command: |
export DEPLOYING_COLOR="$CURRENT_COLOR"
JOB_NAME="wait-for-glued-data-to-index" ./scripts/migration/set-migration-complete-marker.sh
- run:
name: Enable Dynamodb Streams
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ module.exports = {
'noopener',
'noreferrer',
'overline',
'paginator',
'panuthos',
'panuthos',
'param',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
merge-multiple: true
path: coverage
- name: Process Coverage
run: npx nyc report --check-coverage --branches 94.56 --functions 97 --lines 97 --statements 97 --reporter lcov --reporter text --reporter clover -t coverage
run: npx nyc report --check-coverage --branches 90 --functions 90 --lines 90 --statements 90 --reporter lcov --reporter text --reporter clover -t coverage
- uses: geekyeggo/delete-artifact@v1
with:
name: coverage-artifacts
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
*.iml
shared/src/business/utilities/htmlGenerator/index.scss
/policy.json
artillery/private-app-report.json
artillery/tokens.csv
artillery/token-ids.csv
artillery/private-advanced-order.json
aws.json
aws/lambdas/*.zip
aws/lambdas/RotateInfoIndices/dist
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: node-20.14.0-chrome-125.0.* is debian 12.5 (bookworm)

FROM cypress/browsers:node-20.17.0-chrome-128.0.6613.119-1-ff-130.0-edge-128.0.2739.63-1
FROM cypress/browsers:node-20.18.0-chrome-129.0.6668.89-1-ff-131.0.2-edge-129.0.2792.65-1

WORKDIR /home/app

Expand Down Expand Up @@ -37,12 +37,12 @@ RUN apt-get install -y build-essential
RUN apt-get install -y libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev

ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.46.zip" -o "awscliv2.zip" && \
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.18.8.zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
rm -rf awscliv2.zip

RUN wget -q -O terraform.zip https://releases.hashicorp.com/terraform/1.9.5/terraform_1.9.5_linux_amd64.zip && \
RUN wget -q -O terraform.zip https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_amd64.zip && \
unzip -o terraform.zip terraform && \
rm terraform.zip && \
cp terraform /usr/local/bin/
Expand Down
84 changes: 0 additions & 84 deletions artillery/generate-tokens.sh

This file was deleted.

Loading

0 comments on commit dc30641

Please sign in to comment.