From 646693638ebcae3980bd2aa8885742ed3f53295e Mon Sep 17 00:00:00 2001 From: Adish M Date: Wed, 7 Aug 2024 18:22:53 +0530 Subject: [PATCH 1/2] Corrections in marketpalce workflow to main --- .github/workflows/cypress-marketplace.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cypress-marketplace.yml b/.github/workflows/cypress-marketplace.yml index 8102f2d365..ebccd3d9fd 100644 --- a/.github/workflows/cypress-marketplace.yml +++ b/.github/workflows/cypress-marketplace.yml @@ -68,7 +68,6 @@ jobs: echo "PG_HOST=postgres" >> .env echo "PG_PASS=postgres" >> .env echo "PG_PORT=5432" >> .env - echo "PGRST_DB_PRE_CONFIG=postgrest.pre_config" >> .env echo "ENABLE_TOOLJET_DB=true" >> .env echo "TOOLJET_DB=tooljet_db" >> .env echo "TOOLJET_DB_USER=postgres" >> .env @@ -93,6 +92,11 @@ jobs: # Update docker-compose.yaml with the new image sed -i '/^[[:space:]]*tooljet:/,/^$/ s|^\([[:space:]]*image:[[:space:]]*\).*|\1tooljet/tj-osv:${{ env.SAFE_BRANCH_NAME }}|' docker-compose.yaml + - name: Install Docker Compose + run: | + curl -L "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + chmod +x /usr/local/bin/docker-compose + - name: Run docker-compose file run: docker-compose up -d From 7b69d8f75af0eed09f213ca246be303d20ef35ca Mon Sep 17 00:00:00 2001 From: Adish M Date: Wed, 7 Aug 2024 18:24:09 +0530 Subject: [PATCH 2/2] adding back echo PGRST_DB_PRE_CONFIG=postgrest.pre_config >> .env --- .github/workflows/cypress-marketplace.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cypress-marketplace.yml b/.github/workflows/cypress-marketplace.yml index ebccd3d9fd..04b9348073 100644 --- a/.github/workflows/cypress-marketplace.yml +++ b/.github/workflows/cypress-marketplace.yml @@ -69,6 +69,7 @@ jobs: echo "PG_PASS=postgres" >> .env echo "PG_PORT=5432" >> .env echo "ENABLE_TOOLJET_DB=true" >> .env + echo "PGRST_DB_PRE_CONFIG=postgrest.pre_config" >> .env echo "TOOLJET_DB=tooljet_db" >> .env echo "TOOLJET_DB_USER=postgres" >> .env echo "TOOLJET_DB_HOST=postgres" >> .env