Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'lts-3.0' into fix-resolved-query-headers

Browse source
This commit is contained in:
Nakul Nagargade 2024-11-21 11:21:51 +05:30
commit 532499b815
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
.github/workflows/render-preview-deploy.yml vendored
View file

@ -59,7 +59,7 @@ jobs:
},
{
"key": "TOOLJET_DB",
"value": "${{ env.PR_NUMBER }}-tj-db"
"value": "${{ env.PR_NUMBER }}-tjdb"
},
{
"key": "TOOLJET_DB_HOST",
@ -68,7 +68,7 @@ jobs:
{
"key": "TOOLJET_DB_USER",
"value": "${{ secrets.RENDER_PG_USER }}"
},
},
{
"key": "TOOLJET_DB_PASS",
"value": "${{ secrets.RENDER_PG_PASS }}"
@ -77,10 +77,6 @@ jobs:
"key": "TOOLJET_DB_PORT",
"value": "5432"
},
{
"key": "TOOLJET_DB_STATEMENT_TIMEOUT",
"value": "60000"
},
{
"key": "PGRST_DB_PRE_CONFIG",
"value": "postgrest.pre_config"
@ -258,12 +254,13 @@ jobs:
- name: Wait after installing PostgreSQL
run: sleep 25
- name: Drop PostgreSQL PR database
- name: Drop PostgreSQL PR databases
env:
PGHOST: ${{ secrets.RENDER_DS_PG_HOST }}
PGPORT: 5432
PGUSER: ${{ secrets.RENDER_DS_PG_USER }}
PGDATABASE: ${{ env.PR_NUMBER }}
PGTJBDATABASE: ${{ env.PR_NUMBER }}-tjdb
run: |
if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGDATABASE; then
echo "Database $PGDATABASE exists, deleting..."
@ -272,6 +269,13 @@ jobs:
echo "Database $PGDATABASE does not exist."
fi
if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGTJBDATABASE; then
echo "Database $PGTJBDATABASE exists, deleting..."
PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGTJBDATABASE\" ;"
else
echo "Database $PGTJBDATABASE does not exist."
fi
suspend-review-app:
if: ${{ github.event.action == 'labeled' && github.event.label.name == 'suspend-review-app' }}
runs-on: ubuntu-latest
@ -405,12 +409,13 @@ jobs:
- name: Wait after installing PostgreSQL
run: sleep 25
- name: Drop PostgreSQL PR database
- name: Drop PostgreSQL PR databases
env:
PGHOST: ${{ secrets.RENDER_DS_PG_HOST }}
PGPORT: 5432
PGUSER: ${{ secrets.RENDER_DS_PG_USER }}
PGDATABASE: ${{ env.PR_NUMBER }}
PGTJBDATABASE: ${{ env.PR_NUMBER }}-tjdb
run: |
if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGDATABASE; then
echo "Database $PGDATABASE exists, deleting..."
@ -419,6 +424,13 @@ jobs:
echo "Database $PGDATABASE does not exist."
fi
if PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -lqt | cut -d \| -f 1 | grep -qw $PGTJBDATABASE; then
echo "Database $PGTJBDATABASE exists, deleting..."
PGPASSWORD=${{ secrets.RENDER_DS_PG_PASS }} psql -h $PGHOST -p $PGPORT -U $PGUSER -d postgres -c "drop database \"$PGTJBDATABASE\" ;"
else
echo "Database $PGTJBDATABASE does not exist."
fi
- name: Create deployment
id: create-deployment
run: |
@ -460,13 +472,9 @@ jobs:
"key": "PG_DB",
"value": "${{ env.PR_NUMBER }}"
},
{
"key": "ENABLE_TOOLJET_DB",
"value": "true"
},
{
"key": "TOOLJET_DB",
"value": "${{ env.PR_NUMBER }}-tj-db"
"value": "${{ env.PR_NUMBER }}-tjdb"
},
{
"key": "TOOLJET_DB_HOST",
@ -548,10 +556,6 @@ jobs:
"key": "LICENSE_KEY",
"value": "${{ secrets.RENDER_LICENSE_KEY }}"
},
{
"key": "ENABLE_MARKETPLACE_FEATURE",
"value": "true"
},
{
"key": "TOOLJET_MARKETPLACE_URL",
"value": "${{ secrets.MARKETPLACE_BUCKET }}"