Commit Graph

75 Commits

Author SHA1 Message Date
Arpit Mohan
862a310050 Fixing merge conflicts during cherry picking 2020-10-30 12:54:52 +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
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
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
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
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
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
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