Skip to content

Commit b945f51

Browse files
thesocialdevthesocialdev
authored
Merge pull request #1823 from AletheiaFact/1709-bug-personality-card-break-on-searchpage
Fix Personality card break on smaller screens on search page
2 parents 7fe75d4 + f75c0bd commit b945f51

File tree

5 files changed

+237
-236
lines changed

5 files changed

+237
-236
lines changed

‎.github/workflows/aws.yml‎

Lines changed: 143 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,160 @@
11
name: Deploy to AWS EKS
22

33
on:
4-
push:
5-
branches:
6-
- master
7-
- stage
8-
- ufpb-labcheck
9-
# For future
10-
# release:
11-
# types: [created]
4+
push:
5+
branches:
6+
- master
7+
- stage
8+
- ufpb-labcheck
9+
# For future
10+
# release:
11+
# types: [created]
1212
env:
13-
ECR_REGISTRY: ${{ secrets.ECR_REGISTRY }}
14-
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
15-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
16-
AWS_DEFAULT_REGION: us-east-1
17-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
13+
ECR_REGISTRY: ${{ secrets.ECR_REGISTRY }}
14+
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
15+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
16+
AWS_DEFAULT_REGION: us-east-1
17+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1818
jobs:
19-
setup-build-publish:
20-
name: Build & Publish
21-
runs-on: ubuntu-latest
22-
environment: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
23-
env:
24-
ENVIRONMENT: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
25-
AWS_SDK_BUCKET: ${{ secrets.AWS_SDK_BUCKET }}
26-
API_URL: ${{ secrets.API_URL }}
27-
GITHUB_SHA: ${{ github.sha }}
28-
IMAGE: aletheiafact-production
29-
ENV: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
30-
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
31-
UMAMI_SITE_ID: ${{ secrets.UMAMI_SITE_ID }}
32-
MONGODB_URI: ${{ secrets.MONGODB_URI }}
33-
MONGODB_NAME: ${{ secrets.MONGODB_NAME }}
34-
ORY_SDK_URL: ${{ secrets.ORY_SDK_URL }}
35-
ORY_ACCESS_TOKEN: ${{ secrets.ORY_ACCESS_TOKEN }}
36-
ORYCLOUD: "enabled"
37-
ENABLE_BANNER_DONATION: ${{ vars.NEXT_PUBLIC_ENABLE_BANNER_DONATION }}
38-
ALETHEIA_SCHEMA_ID: ${{ secrets.ALETHEIA_SCHEMA_ID }}
39-
RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
40-
NOVU_API_KEY: ${{ secrets.NOVU_API_KEY }}
41-
NOVU_APPLICATION_IDENTIFIER: ${{ secrets.NOVU_APPLICATION_IDENTIFIER }}
42-
NEW_RELIC_APP_NAME: ${{ secrets.NEW_RELIC_APP_NAME }}
43-
GITLAB_FEATURE_FLAG_URL: ${{ secrets.GITLAB_FEATURE_FLAG_URL }}
44-
GITLAB_FEATURE_FLAG_INSTANCE_ID: ${{ secrets.GITLAB_FEATURE_FLAG_INSTANCE_ID }}
45-
# Needed env variables for first build on next
46-
NEXT_PUBLIC_UMAMI_SITE_ID: ${{ secrets.UMAMI_SITE_ID }}
47-
NEXT_PUBLIC_RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
48-
AGENTS_API_URL: ${{ secrets.AGENTS_API_URL }}
49-
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
50-
ZENVIA_API_URL: ${{ secrets.ZENVIA_API_URL }}
51-
ZENVIA_API_TOKEN: ${{ secrets.ZENVIA_API_TOKEN }}
52-
AGENCIA_ACCESS_TOKEN: ${{ secrets.AGENCIA_ACCESS_TOKEN }}
53-
RECAPTCHA_SECRET: ${{ secrets.RECAPTCHA_SECRETKEY }}
54-
TAG: ${{ github.sha}}
55-
steps:
56-
- name: Checkout
57-
uses: actions/checkout@v2
19+
setup-build-publish:
20+
name: Build & Publish
21+
runs-on: ubuntu-latest
22+
environment: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
23+
env:
24+
ENVIRONMENT: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
25+
AWS_SDK_BUCKET: ${{ secrets.AWS_SDK_BUCKET }}
26+
API_URL: ${{ secrets.API_URL }}
27+
GITHUB_SHA: ${{ github.sha }}
28+
IMAGE: aletheiafact-production
29+
ENV: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
30+
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
31+
UMAMI_SITE_ID: ${{ secrets.UMAMI_SITE_ID }}
32+
MONGODB_URI: ${{ secrets.MONGODB_URI }}
33+
MONGODB_NAME: ${{ secrets.MONGODB_NAME }}
34+
ORY_SDK_URL: ${{ secrets.ORY_SDK_URL }}
35+
ORY_ACCESS_TOKEN: ${{ secrets.ORY_ACCESS_TOKEN }}
36+
ORYCLOUD: "enabled"
37+
ENABLE_BANNER_DONATION: ${{ vars.NEXT_PUBLIC_ENABLE_BANNER_DONATION }}
38+
ALETHEIA_SCHEMA_ID: ${{ secrets.ALETHEIA_SCHEMA_ID }}
39+
RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
40+
NOVU_API_KEY: ${{ secrets.NOVU_API_KEY }}
41+
NOVU_APPLICATION_IDENTIFIER: ${{ secrets.NOVU_APPLICATION_IDENTIFIER }}
42+
NEW_RELIC_APP_NAME: ${{ secrets.NEW_RELIC_APP_NAME }}
43+
GITLAB_FEATURE_FLAG_URL: ${{ secrets.GITLAB_FEATURE_FLAG_URL }}
44+
GITLAB_FEATURE_FLAG_INSTANCE_ID: ${{ secrets.GITLAB_FEATURE_FLAG_INSTANCE_ID }}
45+
# Needed env variables for first build on next
46+
NEXT_PUBLIC_UMAMI_SITE_ID: ${{ secrets.UMAMI_SITE_ID }}
47+
NEXT_PUBLIC_RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
48+
AGENTS_API_URL: ${{ secrets.AGENTS_API_URL }}
49+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
50+
ZENVIA_API_URL: ${{ secrets.ZENVIA_API_URL }}
51+
ZENVIA_API_TOKEN: ${{ secrets.ZENVIA_API_TOKEN }}
52+
AGENCIA_ACCESS_TOKEN: ${{ secrets.AGENCIA_ACCESS_TOKEN }}
53+
RECAPTCHA_SECRET: ${{ secrets.RECAPTCHA_SECRETKEY }}
54+
TAG: ${{ github.sha}}
55+
steps:
56+
- name: Checkout
57+
uses: actions/checkout@v4
5858

59-
- name: Configure AWS credentials
60-
uses: aws-actions/configure-aws-credentials@v1
61-
with:
62-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
63-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
64-
aws-region: us-east-1
59+
- name: Configure AWS credentials
60+
uses: aws-actions/configure-aws-credentials@v1
61+
with:
62+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
63+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
64+
aws-region: us-east-1
6565

66-
- name: Login to Amazon ECR
67-
id: login-ecr
68-
uses: aws-actions/amazon-ecr-login@v1
66+
- name: Login to Amazon ECR
67+
id: login-ecr
68+
uses: aws-actions/amazon-ecr-login@v1
6969

70-
- name: Install pkl
71-
uses: pkl-community/setup-pkl@v0
72-
with:
73-
pkl-version: 0.25.2
74-
# Setting up config.yaml based on environment
75-
- name: Set config.yaml
76-
run: |
77-
pkl eval -f yaml ./deployment/config/config-file/$ENVIRONMENT.pkl > config.$ENVIRONMENT.yaml
70+
- name: Install pkl
71+
uses: pkl-community/setup-pkl@v0
72+
with:
73+
pkl-version: 0.25.2
74+
# Setting up config.yaml based on environment
75+
- name: Set config.yaml
76+
run: |
77+
pkl eval -f yaml ./deployment/config/config-file/$ENVIRONMENT.pkl > config.$ENVIRONMENT.yaml
7878
79-
- name: Set migrate-mongo-config.ts
80-
run: |
81-
sed -i "s%MONGODB_URI%$MONGODB_URI%g" migrate-mongo-config-example.ts
82-
sed -i "s%MONGODB_NAME%$MONGODB_NAME%g" migrate-mongo-config-example.ts
79+
- name: Set migrate-mongo-config.ts
80+
run: |
81+
sed -i "s%MONGODB_URI%$MONGODB_URI%g" migrate-mongo-config-example.ts
82+
sed -i "s%MONGODB_NAME%$MONGODB_NAME%g" migrate-mongo-config-example.ts
8383
84-
# Build the Docker image
85-
- name: Build
86-
run: |
87-
docker build --build-arg ENVIRONMENT=$ENVIRONMENT \
88-
--build-arg NEXT_PUBLIC_UMAMI_SITE_ID=$NEXT_PUBLIC_UMAMI_SITE_ID \
89-
--build-arg NEXT_PUBLIC_ENVIRONMENT=$ENVIRONMENT \
90-
--build-arg NEXT_PUBLIC_ORY_SDK_URL=$ORY_SDK_URL \
91-
--build-arg NEXT_PUBLIC_ORYCLOUD=$ORYCLOUD \
92-
--build-arg NEXT_PUBLIC_ENABLE_BANNER_DONATION=$ENABLE_BANNER_DONATION \
93-
--build-arg NEXT_PUBLIC_RECAPTCHA_SITEKEY=${{ secrets.NEXT_PUBLIC_RECAPTCHA_SITEKEY }} \
94-
-t "$ECR_REGISTRY"/"$IMAGE":"$GITHUB_SHA" .
95-
docker tag "$ECR_REGISTRY"/"$IMAGE":"$GITHUB_SHA" "$ECR_REGISTRY"/"$IMAGE":latest
84+
# Build the Docker image
85+
- name: Build
86+
run: |
87+
docker build --build-arg ENVIRONMENT=$ENVIRONMENT \
88+
--build-arg NEXT_PUBLIC_UMAMI_SITE_ID=$NEXT_PUBLIC_UMAMI_SITE_ID \
89+
--build-arg NEXT_PUBLIC_ENVIRONMENT=$ENVIRONMENT \
90+
--build-arg NEXT_PUBLIC_ORY_SDK_URL=$ORY_SDK_URL \
91+
--build-arg NEXT_PUBLIC_ORYCLOUD=$ORYCLOUD \
92+
--build-arg NEXT_PUBLIC_ENABLE_BANNER_DONATION=$ENABLE_BANNER_DONATION \
93+
--build-arg NEXT_PUBLIC_RECAPTCHA_SITEKEY=${{ secrets.NEXT_PUBLIC_RECAPTCHA_SITEKEY }} \
94+
-t "$ECR_REGISTRY"/"$IMAGE":"$GITHUB_SHA" .
95+
docker tag "$ECR_REGISTRY"/"$IMAGE":"$GITHUB_SHA" "$ECR_REGISTRY"/"$IMAGE":latest
9696
97-
# Push the Docker image to Google Container Registry
98-
- name: Publish
99-
run: |
100-
docker push $ECR_REGISTRY/$IMAGE:$GITHUB_SHA
101-
if [[ "$ENVIRONMENT" == "production" ]]; then docker push "$ECR_REGISTRY"/"$IMAGE":latest; fi
97+
# Push the Docker image to Google Container Registry
98+
- name: Publish
99+
run: |
100+
docker push $ECR_REGISTRY/$IMAGE:$GITHUB_SHA
101+
if [[ "$ENVIRONMENT" == "production" ]]; then docker push "$ECR_REGISTRY"/"$IMAGE":latest; fi
102102
103-
deploy:
104-
name: Deploy
105-
needs: setup-build-publish
106-
runs-on: ubuntu-latest
107-
environment: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
108-
env:
109-
ENVIRONMENT: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
110-
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
111-
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
112-
UMAMI_SITE_ID: ${{ secrets.UMAMI_SITE_ID }}
113-
ORY_SDK_URL: ${{ secrets.ORY_SDK_URL }}
114-
ORY_ACCESS_TOKEN: ${{ secrets.ORY_ACCESS_TOKEN }}
115-
RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
116-
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
117-
ORYCLOUD: "enabled"
118-
ENABLE_BANNER_DONATION: ${{ vars.NEXT_PUBLIC_ENABLE_BANNER_DONATION }}
119-
TAG: ${{ github.sha}}
120-
steps:
121-
- name: Checkout
122-
uses: actions/checkout@v2
103+
deploy:
104+
name: Deploy
105+
needs: setup-build-publish
106+
runs-on: ubuntu-latest
107+
environment: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
108+
env:
109+
ENVIRONMENT: ${{ github.ref_name == 'stage' && 'development' || github.ref_name == 'master' && 'production' || github.ref_name }}
110+
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
111+
NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
112+
UMAMI_SITE_ID: ${{ secrets.UMAMI_SITE_ID }}
113+
ORY_SDK_URL: ${{ secrets.ORY_SDK_URL }}
114+
ORY_ACCESS_TOKEN: ${{ secrets.ORY_ACCESS_TOKEN }}
115+
RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
116+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
117+
ORYCLOUD: "enabled"
118+
ENABLE_BANNER_DONATION: ${{ vars.NEXT_PUBLIC_ENABLE_BANNER_DONATION }}
119+
TAG: ${{ github.sha}}
120+
steps:
121+
- name: Checkout
122+
uses: actions/checkout@v4
123123

124-
- name: Install pkl
125-
uses: pkl-community/setup-pkl@v0
126-
with:
127-
pkl-version: 0.25.2
124+
- name: Install pkl
125+
uses: pkl-community/setup-pkl@v0
126+
with:
127+
pkl-version: 0.25.2
128128

129-
- name: Set deployment/app.yml
130-
run: |
131-
pkl eval -f yaml ./deployment/k8s/$ENVIRONMENT.pkl > deployment/app.yml
129+
- name: Set deployment/app.yml
130+
run: |
131+
pkl eval -f yaml ./deployment/k8s/$ENVIRONMENT.pkl > deployment/app.yml
132132
133-
- name: Applying Kubernetes Deployment
134-
uses: giovannirossini/aws-eks@v1.0.1
135-
with:
136-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
137-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
138-
aws-region: "us-east-1"
139-
cluster-name: "production"
140-
command: kubectl apply -f ./deployment/
133+
- name: Applying Kubernetes Deployment
134+
uses: giovannirossini/aws-eks@v1.0.1
135+
with:
136+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
137+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
138+
aws-region: "us-east-1"
139+
cluster-name: "production"
140+
command: kubectl apply -f ./deployment/
141141

142-
- name: Validation
143-
uses: giovannirossini/aws-eks@v1.0.1
144-
with:
145-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
146-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
147-
aws-region: "us-east-1"
148-
cluster-name: "production"
149-
command: kubectl rollout status deployments/aletheia -n ${{ env.ENVIRONMENT }} --timeout=360s
150-
if: success()
142+
- name: Validation
143+
uses: giovannirossini/aws-eks@v1.0.1
144+
with:
145+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
146+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
147+
aws-region: "us-east-1"
148+
cluster-name: "production"
149+
command: kubectl rollout status deployments/aletheia -n ${{ env.ENVIRONMENT }} --timeout=360s
150+
if: success()
151151

152-
- name: Rollback
153-
uses: giovannirossini/aws-eks@v1.0.1
154-
with:
155-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
156-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
157-
aws-region: "us-east-1"
158-
cluster-name: "production"
159-
command: kubectl rollout undo deployments/aletheia -n ${{ env.ENVIRONMENT }}
160-
if: failure()
152+
- name: Rollback
153+
uses: giovannirossini/aws-eks@v1.0.1
154+
with:
155+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
156+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
157+
aws-region: "us-east-1"
158+
cluster-name: "production"
159+
command: kubectl rollout undo deployments/aletheia -n ${{ env.ENVIRONMENT }}
160+
if: failure()

0 commit comments

Comments
 (0)