Commit Graph

121 Commits

Author SHA1 Message Date
Arpit Mohan
a65b915fb3 Fixing merge conflicts when back merging master into release 2020-10-30 15:33:43 +05:30
Arpit Mohan
17ae082637 Moving to conditional if steps 2020-10-30 15:11:59 +05:30
Arpit Mohan
4df2801643 Splitting the if conditions 2020-10-30 15:04:01 +05:30
Arpit Mohan
ca72e1f382 Trying a different syntax 2020-10-30 14:57:38 +05:30
Arpit Mohan
0595b8d05a Adding more debug logging 2020-10-30 14:52:34 +05:30
Arpit Mohan
594bae4d17 Making the default shell bash 2020-10-30 14:49:37 +05:30
Arpit Mohan
184cda75cf Minor changes in the client.ymp file 2020-10-30 14:17:31 +05:30
Arpit Mohan
7b76dfd293 Adding debug logs for the output variable 2020-10-30 14:10:14 +05:30
Arpit Mohan
71f5daac3a Debugging the github ref 2020-10-30 13:42:31 +05:30
Arpit Mohan
587a90af0f Adding a separate step for the server docker image 2020-10-30 13:24:08 +05:30
Arpit Mohan
dae12f0f03 Fixing the condition for choosing server image for testing 2020-10-30 13:08:04 +05:30
Arpit Mohan
b15c0a1f0b Fixing the docker image name for master builds 2020-10-30 12:56:48 +05:30
Arpit Mohan
862a310050 Fixing merge conflicts during cherry picking 2020-10-30 12:54:52 +05:30
Arpit Mohan
f38df9febc Correcting typo in env variable in client.yml 2020-10-29 16:19:14 +05:30
Arpit Mohan
63329b3762 Fixing bad merge 2020-10-29 16:05:37 +05:30
Arpit Mohan
7668560738 Fixing merge conflicts 2020-10-29 15:51:04 +05:30
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