Skip to content

Commit

Permalink
Merge pull request #1234 from AletheiaFact/stage
Browse files Browse the repository at this point in the history
Production Release v1.0.4
  • Loading branch information
thesocialdev authored Jun 3, 2024
2 parents 373e509 + c209932 commit bdf16a7
Show file tree
Hide file tree
Showing 75 changed files with 1,331 additions and 550 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ env:
NEXT_PUBLIC_UMAMI_SITE_ID: ${{ secrets.DEVELOPMENT_UMAMI_SITE_ID }}
NEXT_PUBLIC_RECAPTCHA_SITEKEY: ${{ secrets.RECAPTCHA_SITEKEY }}
AGENTS_API_URL: ${{ secrets.DEVELOPMENT_AGENTS_API_URL }}
OPENAI_API_KEY: ${{ secrets.DEVELOPMENT_OPENAI_API_KEY }}

jobs:
setup-build-publish:
Expand Down Expand Up @@ -69,6 +70,7 @@ jobs:
echo "NEW_RELIC_APP_NAME=${{ secrets.PRODUCTION_NEW_RELIC_APP_NAME }}" >> $GITHUB_ENV
echo "NEXT_PUBLIC_ORY_SDK_URL=${{ secrets.ORY_SDK_URL }}" >> $GITHUB_ENV
echo "AGENTS_API_URL=${{ secrets.PRODUCTION_AGENTS_API_URL }}" >> $GITHUB_ENV
echo "OPENAI_API_KEY=${{ secrets.PRODUCTION_OPENAI_API_KEY }}" >> $GITHUB_ENV
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down Expand Up @@ -100,6 +102,7 @@ jobs:
sed -i "s%NOVU_API_KEY%$NOVU_API_KEY%g" config.$ENVIRONMENT.yaml
sed -i "s%NOVU_APPLICATION_IDENTIFIER%$NOVU_APPLICATION_IDENTIFIER%g" config.$ENVIRONMENT.yaml
sed -i "s%AGENTS_API_URL%$AGENTS_API_URL%g" config.$ENVIRONMENT.yaml
sed -i "s%OPENAI_API_KEY%$OPENAI_API_KEY%g" config.$ENVIRONMENT.yaml
- name: Set migrate-mongo-config.ts
run: |
Expand Down Expand Up @@ -170,6 +173,7 @@ jobs:
echo "AWS_SECRET_ACCESS_KEY=${{ secrets.PRODUCTION_AWS_SECRET_ACCESS_KEY }}" >> $GITHUB_ENV
echo "NOVU_API_KEY=${{ secrets.PRODUCTION_NOVU_API_KEY }}" >> $GITHUB_ENV
echo "NOVU_APPLICATION_IDENTIFIER=${{ secrets.PRODUCTION_NOVU_APPLICATION_IDENTIFIER }}" >> $GITHUB_ENV
echo "OPENAI_API_KEY=${{ secrets.PRODUCTION_OPENAI_API_KEY }}" >> $GITHUB_ENV
- name: Set environment
run: |
Expand All @@ -183,6 +187,7 @@ jobs:
sed -i "s%NEW_RELIC_LICENSE_KEY_STUB%${{ env.NEW_RELIC_LICENSE_KEY }}%g" deployment/app.yml
sed -i "s%NEW_RELIC_APP_NAME_STUB%${{ env.NEW_RELIC_APP_NAME }}%g" deployment/app.yml
sed -i "s%NEXT_PUBLIC_ORYSDKURL_STUB%${{ env.ORY_SDK_URL }}%g" deployment/app.yml
sed -i "s%OPENAI_API_KEY%${{ env.OPENAI_API_KEY }}%g" deployment/app.yml
- name: Set deployment
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.14.0]
node-version: [18.19.1]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.14.0]
node-version: [18.19.1]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -62,7 +62,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.14.0]
node-version: [18.19.1]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -79,7 +79,7 @@ jobs:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# node-version: [18.14.0]
# node-version: [18.19.1]
# steps:
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14.0
18.19.1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.17.0-alpine AS package
FROM node:18.19.1-alpine AS package

ARG NEXT_PUBLIC_UMAMI_SITE_ID
ARG NEXT_PUBLIC_RECAPTCHA_SITEKEY
Expand Down Expand Up @@ -40,7 +40,7 @@ RUN NEXT_PUBLIC_UMAMI_SITE_ID=$NEXT_PUBLIC_UMAMI_SITE_ID \
NEXT_PUBLIC_ORY_SDK_URL=$NEXT_PUBLIC_ORY_SDK_URL \
yarn build

FROM node:18.17.0-alpine
FROM node:18.19.1-alpine

LABEL maintainer="Giovanni Rossini <[email protected]>"

Expand Down
2 changes: 2 additions & 0 deletions config.development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ services:
novu: # Notifications provider
api_key: NOVU_API_KEY
application_identifier: NOVU_APPLICATION_IDENTIFIER
openai:
api_key: OPENAI_API_KEY

2 changes: 2 additions & 0 deletions config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@ services:
endpoint: http://localhost:4566
novu: # Notifications provider
api_key: NOVU_API_KEY
openai:
api_key: OPENAI_API_KEY

2 changes: 2 additions & 0 deletions config.production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ services:
novu: # Notifications provider
api_key: NOVU_API_KEY
application_identifier: NOVU_APPLICATION_IDENTIFIER
openai:
api_key: OPENAI_API_KEY
2 changes: 2 additions & 0 deletions config.seed.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ services:
schema_id: ALETHEIA_SCHEMA_ID
novu: # Notifications provider
api_key: NOVU_API_KEY
openai:
api_key: OPENAI_API_KEY
2 changes: 2 additions & 0 deletions config.seed.test.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ services:
url: {env(GITLAB_FEATURE_FLAG_URL)}
appName: Staging
instanceId: {env(GITLAB_FEATURE_FLAG_INSTANCE_ID)}
openai:
api_key: {env(OPENAI_API_KEY)}
2 changes: 2 additions & 0 deletions config.test.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ services:
bucket: {env(AWS_SDK_BUCKET)}
accessKeyId: {env(AWS_ACCESS_KEY_ID)}
secretAccessKey: {env(AWS_SECRET_ACCESS_KEY)}
openai:
api_key: {env(OPENAI_API_KEY)}
2 changes: 2 additions & 0 deletions deployment/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ spec:
value: aletheia-ENVIRONMENT
- name: NEXT_PUBLIC_ORY_SDK_URL
value: NEXT_PUBLIC_ORYSDKURL_STUB
- name: OPENAI_API_KEY
value: OPENAI_API_KEY_STUB
- name: ENV_NAME_STUB
value: ENVIRONMENT
resources:
Expand Down
Loading

0 comments on commit bdf16a7

Please sign in to comment.