Commit Graph

2155 Commits

Author SHA1 Message Date
Arpit Mohan
591b51b6a9
Ensures that the master & release flows pick appropriate server Docker images (#1465) 2020-10-29 15:44:58 +05:30
Arpit Mohan
3b49e849e6 Fixing the build for server.yml 2020-10-20 15:06:18 +05:30
Arpit Mohan
087078938c Fixing merge conflicts 2020-10-20 14:46:29 +05:30
Arpit Mohan
6ba5057b81 Adding a condition to only build Docker containers on push and not on pull_request_target 2020-10-20 13:21:22 +05:30
Arpit Mohan
8e58822e9a Fixing merge conflicts 2020-10-19 16:43:09 +05:30
Arpit Mohan
dc698e7d59
Fixing warning message in Github Actions (#1261) 2020-10-19 14:42:25 +05:30
Arpit Mohan
2c21246a13 Fixing merge conflicts 2020-10-16 15:02:38 +05:30
Arpit Mohan
3db43a531b Adding comments for server workflow for docker push command
Ensures that there are no errors in the future
2020-10-16 14:01:56 +05:30
Arpit Mohan
7317a7410b Making the client build workflow with pull_request_target 2020-10-15 15:26:21 +05:30
Arpit Mohan
eebc428072 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-12 10:08:12 +05:30
Hetu Nandu
9ac935c424
Fix release cleanup issues (#1132) 2020-10-11 19:02:02 +05:30
Arpit Mohan
7f21458a35 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-10 16:01:53 +05:30
Arpit Mohan
4856300b63 Hotfix to fix the client build workflow 2020-10-10 10:00:41 +05:30
Arpit Mohan
d70d7f5a4a
Getting Cypress to work correctly for internal pull requests (#1121) 2020-10-10 09:57:19 +05:30
Automated Github Action
66fc1ad5e0 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-09 09:07:34 +00:00
Arpit Mohan
99f039aa43
Adding the close-label.yml file required by Github App to mark issues as QA (#1091)
Fixes #1090

When a PR is successfully merged, the Github bot will add the label QA to the issue. These issues can then be picked up by the QA team for verification. Refer: https://github.com/Logerfo/close-label
2020-10-09 14:17:26 +05:30
Arpit Mohan
5fd163e3f4 Moving the Github Action for client to pull_request_target 2020-10-09 13:09:10 +05:30
Hetu Nandu
6f43dbb089 Revert build id changes 2020-10-08 22:30:59 +05:30
Hetu Nandu
74ef1c9976 CI: Fix build id step: 2020-10-08 22:19:26 +05:30
Hetu Nandu
581ac5e3ea CI: Try creating build id 2020-10-08 22:15:35 +05:30
Arpit Mohan
0ff4cafc73 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-07 07:17:55 +05:30
Arpit Mohan
0c4b437d98 Adding the condition to fix push vs pull_request_target commit checkouts 2020-10-07 06:37:49 +05:30
Arpit Mohan
185020e9ad Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-06 18:38:40 +05:30
Hetu Nandu
9920322aed Fix CI checkouts for all pull_request_target steps 2020-10-06 12:38:11 +05:30
Arpit Mohan
fd04e9f95f Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-06 07:40:14 +05:30
Hetu Nandu
c1b498f6b8 Possible fix for CI checkout issue 2020-10-05 22:07:09 +05:30
Hetu Nandu
e2912e0aac Possible fix for CI checkout issue 2020-10-05 21:38:07 +05:30
Automated Github Action
e60a3aba1b Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-05 10:07:27 +00:00
Hetu Nandu
751662d677 Improve PR template. 2020-10-05 14:47:10 +05:30
Automated Github Action
0202c20b7d Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-05 08:07:43 +00:00
Omkar Phansopkar
7d9ea665d4
Fixed the pull request template issue partially (#902)
Fixes #826
2020-10-05 13:20:12 +05:30
Automated Github Action
f4ca03caa2 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-01 14:07:26 +00:00
Nikhil Nandagopal
ae59298866
Release (#850)
* Stop showing empty table when there are no records (#790)

* Datasource explorer fixes (#789)

- Expand datasource by default
- Let column/key name take more space.
- Show column popup on hover instead of click

* Show datasources without grouping by plugins in explorer (#660)

* Immutable Widgets (#799)

Co-authored-by: Abhinav Jha <abhinav@appsmith.com>

* Removing the docker login step that causes forked PRs to fail (#844)

Also adding pull_request_target event for release and master branch. This will run the GH Actions in the context of the base repository instead of the forked one. Hence, the secrets for Cypress, Docker etc can be passed down to the action for PRs being raised via a fork

* Datasource structure support for MongoDB (#641)

* Added structure for MongoDB datasources

* Fixed tests for MongoDB template queries

* Updating readme to test forked PRs (#845)

* Adding additional docs contribution files. (#849)

* Update CONTRIBUTING.md

* Rename action.md to ActionsGuide.md

* Rename asset-upload.md to UploadingAssets.md

* Rename db-integration.md to DB Integrations.md

* Rename widget.md to Widgets.md

* Rename ActionsGuide.md to Actions.md

* Create CONTRIBUTING.md

* Update Actions.md

* Update Actions.md

* Update Widgets.md

* Update UploadingAssets.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: satbir121 <39981226+satbir121@users.noreply.github.com>
2020-10-01 15:48:50 +05:30
Nikhil Nandagopal
5995beb48b Update issue templates 2020-10-01 14:37:24 +05:30
Arpit Mohan
7614ff922c Correcting the image name in client.yml build file 2020-10-01 14:06:29 +05:30
Arpit Mohan
170c07136b Adding the docker login step in client.yml for pulling the EE server docker image 2020-10-01 13:52:49 +05:30
Arpit Mohan
47bed3b89f Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-01 13:49:36 +05:30
Nikhil Nandagopal
751dfc92ed Merge branch 'master' into release 2020-10-01 12:17:41 +05:30
Arpit Mohan
64ee62f72f
Removing the docker login step that causes forked PRs to fail (#844)
Also adding pull_request_target event for release and master branch. This will run the GH Actions in the context of the base repository instead of the forked one. Hence, the secrets for Cypress, Docker etc can be passed down to the action for PRs being raised via a fork
2020-10-01 09:40:08 +05:30
Nikhil Nandagopal
4c20412c5c
Delete generate-issue-report.yml 2020-09-30 20:55:59 +05:30
Nikhil Nandagopal
03c64a0554
Delete CONTRIBUTING.md 2020-09-30 20:36:13 +05:30
Nikhil Nandagopal
def2b40419
Create CONTRIBUTING.md 2020-09-30 20:32:36 +05:30
Nikhil Nandagopal
30599814e1
Delete task-issue-template.md 2020-09-30 16:56:31 +05:30
Nikhil Nandagopal
f49980fff7
Delete -task.md 2020-09-30 16:56:02 +05:30
Nikhil Nandagopal
8cbddb356b Update issue templates 2020-09-30 16:55:26 +05:30
Nikhil Nandagopal
4a19cd2a5b
Update generate-issue-report.yml 2020-09-29 15:57:51 +05:30
Nikhil Nandagopal
eaf40b6595
Update generate-issue-report.yml 2020-09-29 15:55:14 +05:30
Nikhil Nandagopal
dd23fc7e4b
Update generate-issue-report.yml 2020-09-29 15:42:29 +05:30
Nikhil Nandagopal
2cb1f2a34f
Update generate-issue-report.yml 2020-09-29 15:38:36 +05:30
Nikhil Nandagopal
c83a78c492
Create generate-issue-report.yml 2020-09-29 15:37:54 +05:30
Nikhil Nandagopal
8a995b038e
Create issue-report-config.json 2020-09-29 15:35:34 +05:30
Nikhil Nandagopal
646fbc5af6
Update ---bug-report.md 2020-09-29 15:27:34 +05:30
Arpit Mohan
08533e3fb9 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-09-22 09:58:58 +05:30
Arpit Mohan
13a330b225
Fixing the condition in Github Actions to set React env during release build (#658) 2020-09-22 09:05:43 +05:30
Arpit Mohan
f7f5e9fabc Fixing merge conflicts in server README 2020-09-18 13:59:45 +05:30
Arpit Mohan
149df6925a
Removing the keep-alive ping check for CI builds (#565) 2020-09-18 13:13:40 +05:30
Automated Github Action
00ce029158 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-07 06:07:01 +00:00
Nikhil Nandagopal
46db0aa177
Update ---bug-report.md 2020-09-07 10:44:58 +05:30
Automated Github Action
e9041d66de Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-09-04 06:06:49 +00:00
Nikhil Nandagopal
4e325bcf3e
Update ---bug-report.md 2020-09-04 11:29:01 +05:30
Automated Github Action
3b5c58b963 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-27 12:08:14 +00:00
Hetu Nandu
b20e41affd
Create PULL_REQUEST_TEMPLATE.md (#426) 2020-08-27 16:47:51 +05:30
Arpit Mohan
aeb9ecb8f4 Fixing merge conflicts 2020-08-13 18:59:41 +05:30
Arpit Mohan
a9e16ee6c0
Adding dummy check in server build to satisfy required status checks (#296)
This is a hack to get around the fact that Github Actions doesn't support conditional status checks for monorepo PRs. Hence, we create similar jobs in the both server & client builds. In the server build, those jobs are dummy jobs that do nothing but satisfy the all-encompassing green tick so that PRs can be merged without using Admin privileges.
2020-08-13 14:50:34 +05:30
Arpit Mohan
a17d7a4a8f Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-08-11 17:17:35 +05:30
Trisha Anand
a6496bd5af
Correcting the Docker image for Appsmith server for Github actions test (#260)
* Correcting the Docker image for Appsmith server for Github actions test

* Also fixing the bug where the datasource config is not returned properly for restapi-plugin

Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2020-08-11 16:53:47 +05:30
Automated Github Action
b66bf6982b Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-08-05 11:04:54 +00:00
Nikhil Nandagopal
c4ae61a070 Update issue templates 2020-08-05 16:28:25 +05:30
Nikhil Nandagopal
a2c6d4938d
Update config.yml 2020-08-05 16:23:05 +05:30
Nikhil Nandagopal
d2290a2314 Update issue templates 2020-08-05 16:14:47 +05:30
Nikhil Nandagopal
c090108a89 Update issue templates 2020-08-05 16:13:42 +05:30
Nikhil Nandagopal
ae49aa5951
Create config.yml 2020-08-05 16:05:34 +05:30
Nikhil Nandagopal
d7c3370b24 Update issue templates 2020-08-05 16:00:37 +05:30
Nikhil Nandagopal
7ace4c66d9
Update issue templates (#227) 2020-08-05 15:58:17 +05:30
Nikhil Nandagopal
c9616e5ba6
Update issue templates (#225)
Updated Issue Template
2020-08-05 15:57:32 +05:30
Arpit Mohan
953e03e24f Adding the automated username & email for merges 2020-08-03 13:49:56 +05:30
Arpit Mohan
0e87baf395 Cloning the entire repo so that merge is possible 2020-07-30 10:14:30 +05:30
Arpit Mohan
7ffd5993e7 Modifying the remote add https url 2020-07-29 01:05:42 +05:30
Arpit Mohan
f6debe1178 Correcting the docker tags built during release 2020-07-28 20:09:41 +05:30
Arpit Mohan
1b2b47342b Adding the github action to sync release branch from CE 2020-07-28 19:36:51 +05:30
Arpit Mohan
9c0b2a4e33 Merging community release 2020-07-28 19:27:12 +05:30
Arpit Mohan
ad41063944
Fixing bug for beta releases (#185) 2020-07-28 18:52:59 +05:30
Arpit Mohan
7eda0f0201
Making the pre-release tag configurable based on the tag (#184) 2020-07-28 18:21:40 +05:30
Arpit Mohan
0bff7ca165
Adding nightly builds that will be generated on each push to master (#183)
The latest tag will only be generated when a non-beta Github release is created.
2020-07-28 17:33:05 +05:30
Arpit Mohan
f3d88bc8b8
Removing erroneous condition on master branch (#180) 2020-07-28 15:04:13 +05:30
Arpit Mohan
55bb744a3b
Adding condition to run only on master branch for specific tag push (#179) 2020-07-28 14:55:16 +05:30
Arpit Mohan
7b142ba8b8
Fixing the github yml (#178) 2020-07-28 14:26:51 +05:30
Arpit Mohan
5028a98d45
Correcting github release action yml file (#177) 2020-07-28 14:17:16 +05:30
Arpit Mohan
f120fb1281
Fixing the yml file for Github Action (#171) 2020-07-27 12:31:00 +05:30
Arpit Mohan
015c56e1a6
Github action to push to Docker Hub and create Github release (#169)
* Adding a github action to push to Docker Hub and create Github release when a tag is created on master branch.

* Extracting the tag from the github ref and only tagging the Docker image with the relevant tag.
2020-07-27 11:52:18 +05:30
Arpit Mohan
52d5c4bdcd Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-22 13:12:14 +05:30
Hetu Nandu
fe43680abc
Action test fixes (#130)
* Fixes for tests
* remove marketplace tests
* fix some other tests
* Simplify update datasource
* Add cypress env variables
2020-07-21 19:31:51 +05:30
Trisha Anand
30bbbd6e4e Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-07-21 11:02:02 +05:30
Arpit Mohan
8061de6418
Correcting the package step for client package step (#114) 2020-07-16 18:24:49 +05:30
Arpit Mohan
a9ed054cbb
Adding Github Action workflow to the client code base (#66)
This PR adds the build, test & package workflow to the client code base as well.

In order for us to run the Cypress tests, we also spin up a local server in a Docker container and run all our tests against that server. This ensures that our tests are faster to run as well.

We also introduce the concept of stubbing network requests by stubbing the API that fetches the property pane configuration from the server.

Results for the Cypress tests can be viewed at: https://dashboard.cypress.io/projects/eyxvp8/runs/
2020-07-16 11:20:46 +05:30
Arpit Mohan
4efabb540e Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-07-14 14:46:54 +05:30
Trisha Anand
fd0f23b9cc
Database credentials encryption in MongoDB (#80)
* Encrypting the password stored in AuthenticationDTO for every db.

* Adding comment to the properties file to denote that adding encryption salt and password are mandatory to the server coming up.

* Added the encryption salt and password to server.yml to allow the github actions to succeed.

* Adding database migration to encrypt the existing passwords for authentication object (used for storing db connection username/password)

Changes to the installation script install.sh:

1. Instead of overwriting the existing encryption password or salt, giving the user an option to conserve the previous encryption credentials to ensure that the developer users do not lose access to their database configurations (passwords).
2. Added another file for writing encryption credentials (encryption.env) to ensure that we dont delete the encryption password and salt by mistake.
2020-07-14 14:45:08 +05:30
Arpit Mohan
5e6f5dd7d3 Correcting the Docker images for the appsmith editor and server for EE versions 2020-07-09 21:38:14 +05:30
Arpit Mohan
c31fb9acd4 Correcting the Github Action for the client Docker image build 2020-07-09 18:53:13 +05:30
Arpit Mohan
9c6b2967de Adding the step to add the release tag based on the branch in the client Docker image 2020-07-09 18:51:31 +05:30
Arpit Mohan
3fcf44948f
Adding the steps to build docker container for the client codebase (#63)
Also adding the steps to run Jest tests for the client
2020-07-09 18:39:21 +05:30
Arpit Mohan
e9d87084f4 Correcting the Docker image repository path for CE server builds 2020-07-09 17:49:53 +05:30
Arpit Mohan
0ee803cdbd Correcting the Docker image repository for appsmith-server-ee 2020-07-07 11:35:36 +05:30
Shrikant Sharat Kandula
56547ec02f
Move application configuration to be loaded from environment variables (#23)
* Move application configuration to be loaded from environment variables
* Remove unused sentry.properties
* Make missing value sentinel a constant and ignore all *.env files
* Removed now-used ACL properties
* Prefix RapidAPI environment variable with APPSMITH_
* Fix application properties not being loaded into static fields
* Remove application-test.properties file
* Add required env variables for test in GitHub
* Quote URLs for MongoDB and Redis in test config
* Change RAPIDAPI to RAPID_API in environment variable names
* Source .env file in the root of repo in start script
2020-07-06 14:35:56 +05:30
Arpit Mohan
3035ec9bef
Adding the Github action workflow for the server code (#24)
* Adding the Github action workflow for the server code

* Modifying the redis endpoint in application-test.properties to point to localhost because the Docker service exposes ports to the host
2020-07-03 14:40:57 +05:30