Skip to content

Commit

Permalink
Merge branch '10391-dynamo-migrations-kysely-aurora-rds-tokens' of gi…
Browse files Browse the repository at this point in the history
…thub.com:flexion/ef-cms into 10491-work-item-refactor
  • Loading branch information
pixiwyn committed Oct 2, 2024
2 parents 34676fc + fb527e9 commit 0f98fef
Show file tree
Hide file tree
Showing 110 changed files with 6,861 additions and 17,850 deletions.
2 changes: 1 addition & 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.11
efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.12

parameters:
run_build_and_deploy:
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
4 changes: 2 additions & 2 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.137-1-ff-130.0.1-edge-128.0.2739.67-1
FROM cypress/browsers:node-20.17.0-chrome-129.0.6668.70-1-ff-130.0.1-edge-129.0.2792.52-1

WORKDIR /home/app

Expand Down Expand Up @@ -37,7 +37,7 @@ 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.56.zip" -o "awscliv2.zip" && \
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.59.zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
rm -rf awscliv2.zip
Expand Down
84 changes: 0 additions & 84 deletions artillery/generate-tokens.sh

This file was deleted.

250 changes: 0 additions & 250 deletions artillery/keywords.csv

This file was deleted.

12 changes: 0 additions & 12 deletions artillery/messages/create-token-ids.js

This file was deleted.

13 changes: 0 additions & 13 deletions artillery/messages/extract-user-ids.js

This file was deleted.

Loading

0 comments on commit 0f98fef

Please sign in to comment.