Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
03777b2
feat: Enable server tests on PRs raised on PG branch
abhvsn May 14, 2024
7256d66
feat: Add postgresql docker image before running the tests
abhvsn May 14, 2024
72c8718
chore: Minor refactor
abhvsn May 14, 2024
15ec4c3
chore: Move the transform script trigger to build.sh
abhvsn May 14, 2024
a7d9ccd
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/e…
abhvsn May 15, 2024
b5c0601
chore: Update the DB URI env variable
abhvsn May 15, 2024
4ba5004
chore: Add verbose comment for postgres URI check
abhvsn May 15, 2024
0c4f065
fix: Updated name for URI in migration
abhvsn May 15, 2024
35800ce
refactor: Remove application-production.properties to avoid the confu…
abhvsn May 15, 2024
99c6e5c
chore: Run transform script to add the cake classes
abhvsn May 16, 2024
68cb893
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/e…
abhvsn May 16, 2024
95c6c05
Merge branch 'feat/enable-server-tests-for-pg' of github.com:appsmith…
abhvsn May 16, 2024
acd841b
feat: Add fallback for DB URI in entrypoint.sh
abhvsn May 16, 2024
25bbced
chore: Remove envs while building the server
abhvsn May 16, 2024
17a659f
fix: DB URI name
abhvsn May 16, 2024
c84744b
chore: Update the DB URL variable
abhvsn May 16, 2024
ea58c43
refactor: Add DB url config in entrypoint.sh
abhvsn May 16, 2024
e34e211
cleanup: Remove un-necessary migration to update db URL name
abhvsn May 16, 2024
285cb37
chore: Remove fallback for DB URL
abhvsn May 16, 2024
bfc372c
feat: Add more context on DB url to initialise the DB from entrypoint.sh
abhvsn May 16, 2024
4ce41e5
fix: Postgres container run command for running the tests
abhvsn May 16, 2024
fab1e9b
chore: Update the check to test for jdbc string at the start of the D…
abhvsn May 16, 2024
30c7cba
chore: Replace the DB name in few other files
abhvsn May 16, 2024
146a224
fix: DB URL name in readme
abhvsn May 16, 2024
1ba2d2e
chore: Add stricter checks for DB URL and don't provide fallback for …
abhvsn May 17, 2024
8ec2ebc
chore: Add Postgres envs for username and password
abhvsn May 17, 2024
2d5a4ab
feat: Handle bean initialisation for DB configs
abhvsn May 17, 2024
382b9ec
chore: Update DB URL name in env and readme files
abhvsn May 17, 2024
d0a0968
Merge branch 'feat/enable-server-tests-for-pg' of github.com:appsmith…
abhvsn May 17, 2024
3373b5d
revert: Nomenclature change for deploy-preview script
abhvsn May 20, 2024
0a1199f
chore: Add `ORing` in config map to support backward compatibility
abhvsn May 20, 2024
f00bdcf
feat: Add fallback for APPSMITH_DB_URL in run_with_env script
abhvsn May 20, 2024
87fe4ca
feat: Add fallback for APPSMITH_DB_URL in index.js within deploy dire…
abhvsn May 20, 2024
1562e3e
revert: EnvManager to use existing APPSMITH_MONGODB_URI, as this will…
abhvsn May 20, 2024
4e837fc
Merge branch 'chore/few-more-updates' of github.com:appsmithorg/appsm…
abhvsn May 20, 2024
ed131f3
Merge branch 'feat/enable-server-tests-for-pg' into chore/few-more-up…
abhvsn May 20, 2024
0e32b6e
chore: Update DB connection url in CI
abhvsn May 20, 2024
22716b4
chore: Keep the fallback DB connection url for local dev till this is…
abhvsn May 20, 2024
8ef7d20
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/e…
abhvsn May 20, 2024
21a8284
Merge branch 'feat/enable-server-tests-for-pg' into chore/few-more-up…
abhvsn May 20, 2024
5357654
chore: Remove the requirement for jdbc prefix for postgres connection…
abhvsn May 20, 2024
fcbc861
Merge branch 'feat/enable-server-tests-for-pg' into chore/few-more-up…
abhvsn May 20, 2024
cfe5a1d
test: Update tests
abhvsn May 20, 2024
2fc22dd
Merge branch 'feat/enable-server-tests-for-pg' into chore/few-more-up…
abhvsn May 20, 2024
047c56c
chore: Remove the step to append jdbc
abhvsn May 20, 2024
7e3a79a
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/e…
abhvsn May 20, 2024
895173d
fix: Add profile check for DB config to configure embedded MongoDB fo…
abhvsn May 20, 2024
3f61efa
chore: Migrate DB name from `APPSMITH_MONGODB_URI` to `APPSMITH_DB_URL`
abhvsn May 20, 2024
7a8b8d0
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/e…
abhvsn May 21, 2024
f1837b5
fix: Tests
abhvsn May 21, 2024
020842c
Merge branch 'feat/enable-server-tests-for-pg' of github.com:appsmith…
abhvsn May 21, 2024
6b0a942
Update deploy/docker/fs/opt/appsmith/utils/bin/backup.js
abhvsn May 21, 2024
1fb63ec
chore: Remove prefix support for Postgres DB URL
abhvsn May 21, 2024
762b425
Merge branch 'feat/enable-server-tests-for-pg' of github.com:appsmith…
abhvsn May 21, 2024
fb96715
revert: Helm changes
abhvsn May 22, 2024
2687595
revert: Unwanted changes from entrypoint
abhvsn May 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/quality-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Quality checks

on:
pull_request:
branches: [release, master]
branches: [release, master, pg]

jobs:
path-filter:
Expand Down Expand Up @@ -45,6 +45,7 @@ jobs:
secrets: inherit
with:
pr: ${{ github.event.pull_request.number }}
is-pg-build: ${{ github.event.pull_request.base.ref == 'pg' }}

client-build:
name: client-build
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/server-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ on:
description: "This is the branch to be used for the build."
required: false
type: string
is-pg-build:
description: "This is a boolean value in case the workflow is being called for a PG build"
required: false
type: string
default: "false"

# Change the working directory for all the jobs in this workflow
defaults:
Expand Down Expand Up @@ -133,6 +138,12 @@ jobs:
distribution: "temurin"
java-version: "17"

- name: Conditionally start PostgreSQL
run: |
if [[ inputs.is-pg-build == 'true' ]]; then
docker run -d -p 5432:5432 postgres:alpine
Comment thread
abhvsn marked this conversation as resolved.
Outdated
fi

# Retrieve maven dependencies from cache. After a successful run, these dependencies are cached again
- name: Cache maven dependencies
if: steps.run_result.outputs.run_result != 'success' && (steps.changed-files-specific.outputs.any_changed == 'true' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
Expand All @@ -159,6 +170,11 @@ jobs:
APPSMITH_ENVFILE_PATH: /tmp/dummy.env
APPSMITH_VERBOSE_LOGGING_ENABLED: false
run: |
if [[ "${{ inputs.is-pg-build }}" == "true" ]]; then
export APPSMITH_DB_URL="jdbc:postgresql://localhost:5432/postgres"
else
export APPSMITH_DB_URL="mongodb://localhost:27017/mobtools"
fi
./build.sh -DskipTests
Comment thread
abhvsn marked this conversation as resolved.
Outdated

# Test the code
Expand Down
6 changes: 6 additions & 0 deletions app/server/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ if [[ -f .env ]]; then
source .env
Comment thread
abhvsn marked this conversation as resolved.
fi

# Check the APPSMITH_DB_URL environment variable
if [[ "${APPSMITH_DB_URL}" == *"postgres"* ]]; then
# If it contains "postgres", run the transform script
python3 ./tx/transform.py
fi
Comment thread
abhvsn marked this conversation as resolved.
Outdated

node scripts/check-field-constants.mjs

# Build the code. $@ accepts all the parameters from the input command line and uses it in the maven build command
Expand Down