Commit Graph

2272 Commits

Author SHA1 Message Date
Anagh Hegde
84fbdde5c1
ci: use git merge for syncing changes from release (#35902)
## Description
git merge over cherry-pick with loop by comparing head. 

## Automation

/ok-to-test tags=""

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!WARNING]
> Tests have not run on the HEAD
087dfe23f63ea4e4dc472c1c048009086976f3d1 yet
> <hr>Tue, 27 Aug 2024 10:22:10 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Streamlined workflow for synchronizing releases to the `pg` branch,
enhancing efficiency.
- Directly merges the `release` branch into the `pg` branch, simplifying
the process.
- **Bug Fixes**
- Improved handling of merge conflicts with clearer notifications and
tracking.
- **Chores**
- Refined the conditions for pushing changes, ensuring operations only
occur on successful merges.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-27 15:53:29 +05:30
yatinappsmith
cfab57f5be
ci: Enable Cypress run for master based branches (#35897)
## Description
> [!TIP]  
> _Add a TL;DR when the description is longer than 500 words or
extremely technical (helps the content, marketing, and DevRel team)._
>
> _Please also include relevant motivation and context. List any
dependencies that are required for this change. Add links to Notion,
Figma or any other documents that might be relevant to the PR._


Fixes #`Issue Number`  
_or_  
Fixes `Issue URL`
> [!WARNING]  
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags=""

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!CAUTION]  
> If you modify the content in this section, you are likely to disrupt
the CI result for your PR.

<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Expanded automation capabilities by allowing the CI/CD workflow to
trigger on pull requests targeting the `master` branch, in addition to
the existing `release` and `pg` branches.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-27 13:19:19 +05:30
Anagh Hegde
74685e359c
ci: update logic for handling the merge commits (#35898)
## Description
> [!TIP]  
> _Add a TL;DR when the description is longer than 500 words or
extremely technical (helps the content, marketing, and DevRel team)._
>
> _Please also include relevant motivation and context. List any
dependencies that are required for this change. Add links to Notion,
Figma or any other documents that might be relevant to the PR._


Fixes #`Issue Number`  
_or_  
Fixes `Issue URL`
> [!WARNING]  
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags=""

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!CAUTION]  
> If you modify the content in this section, you are likely to disrupt
the CI result for your PR.

<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No
2024-08-27 13:11:50 +05:30
Sagar Khalasi
5b33768e4c
ci: Updated server logs in CI (#35896)
## Description
Adding server logs


Fixes #`35895`  

## Automation

/ok-to-test tags=""

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!CAUTION]  
> If you modify the content in this section, you are likely to disrupt
the CI result for your PR.

<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Enhanced CI workflow with new steps for collecting and uploading
Docker logs to improve debugging capabilities during failures.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-27 12:33:20 +05:30
Anagh Hegde
55330df6d6
ci: sync release changes to pg (#35893)
## Description
Change the boolean flag for the ci job to capture success or failure

## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/10572876956>
> Commit: 4f3986f053850edb0298934b6f59c398a8708416
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10572876956&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Tue, 27 Aug 2024 06:45:49 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Enhanced notification system for GitHub Actions to alert on any job
failures, improving awareness of issues during workflows.
- **Refactor**
- Modified conditions in the workflow to broaden the criteria for
triggering notifications, ensuring timely alerts for various failure
scenarios.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-27 12:18:33 +05:30
Anagh Hegde
c79b62e536
ci: sync release to pg branch (#35888)
## Description
This CI job is responsible for syncing changes from the release branch
to the pg branch. This happens for every commit merged to release
branch, similar to `Sync Community Workflow`

Fixes #`Issue Number`  

## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/10571814611>
> Commit: 9bc44fc0cc762d52854da3b4e2f8c3e995909ccd
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10571814611&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Tue, 27 Aug 2024 05:00:52 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit


- **New Features**
- Introduced an automated workflow for merging changes from the release
branch to the pg branch, enhancing integration and development
efficiency.
- Added notifications for merge conflicts to improve communication and
resolution tracking.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-27 11:27:04 +05:30
Nikhil Nandagopal
3342d5c8f7 Updated Label Config 2024-08-21 23:05:55 +05:30
Hetu Nandu
3e38ae59d2
chore: Do not mark User testing PRs as stale (#35806)
## Description

Adds a new exception on the stale check workflow. If the PR has the flag
of "User Testing", it will not mark it as stale.




<!-- This is an auto-generated comment: Cypress test results  -->
> [!WARNING]
> Tests have not run on the HEAD
f27d4ceaf7b36227481c8a11a882c5d5c9fe07ea yet
> <hr>Wed, 21 Aug 2024 08:34:31 UTC
<!-- end of auto-generated comment: Cypress test results  -->


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Added the `User Testing` label to the list of exempt labels,
preventing pull requests in user testing from being closed due to
inactivity. This enhances workflow management for extended reviews or
testing periods.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-21 14:16:07 +05:30
Abhijeet
94a732b37a
chore: Add adhoc image builder (#35791) 2024-08-20 20:50:33 +05:30
yatinappsmith
496cecf7c6
CI: Added screenshot for cypress failure (#35671)
Added screenshot archival for cypress failure

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Added a new step in the CI workflow to upload screenshots as artifacts
when Cypress tests fail, enhancing debugging capabilities.
  
- **Bug Fixes**
- Improved the overall functionality of the CI process by providing
immediate access to visual evidence of test failures.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-13 19:05:32 +05:30
Sagar Khalasi
ec4a376600
chore: Un commented yarn cache (#35668)
## Description
Having seen memory failure in EE repo for the yarn install. This same
steps works fine in CE.


Fixes #`35667`  

## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/10369580919>
> Commit: 29e0b8dbbd06ba6068af3484d466a57206e81c3d
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10369580919&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Tue, 13 Aug 2024 12:37:35 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Bug Fixes**
- Restored the Yarn cache during workflow execution in case of failure,
improving build efficiency.

- **Chores**
- Updated GitHub Actions workflow to enhance caching mechanism for
better performance in CI processes.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-13 18:09:01 +05:30
Nikhil Nandagopal
232b10c0d3
Update config.json 2024-08-13 13:57:48 +05:30
Sagar Khalasi
6238b3ed2c
chore: Fix parameter call from build file (#35620)
## Description
We’ve made significant progress and successfully ran a limited set of
test files by fixing parameters in the forked repository. I can able to
atleast trigger the workflow with slash command and passed right
parameter.

The ci-test-limited-with-count.yml workflow now supports running
specific test files. However, an issue was identified with one of the
parameters. To proceed with testing, the identified issue can be
resolved by merging this PR.


Fixes #`34956`  

## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/10351114050>
> Commit: fd17177d71110bf714b5ec4eaf7d2ae683cbdc68
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10351114050&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Mon, 12 Aug 2024 11:57:49 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit



- **Chores**
- Simplified access to the `run_count` variable in the GitHub Actions
workflow, improving readability and potentially enhancing performance.
- Updated syntax for referencing inputs in Cypress test workflows for
better clarity and consistency.
- Clarified default value handling for `run_count`, ensuring predictable
workflow behavior.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-12 17:50:19 +05:30
Hetu Nandu
0afc9dd794
chore: Ability to run PR automations every time PR updates (#35476)
## Description

By changing the workflow trigger and the way to check for correct
labels, we are trying to allow the PR integrations tests to run every
time the PR is updated. That means, if you push changes, and the PR
already has ok-to-test label, it will rerun the tests based on new
changes



## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/10296910575>
> Commit: c59583ba28c8cdff35a12422b8c73838c6efdc85
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10296910575&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Thu, 08 Aug 2024 06:32:48 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **New Features**
- Introduced a new job, `checkTestLabel`, to verify the presence of the
"ok-to-test" label on pull requests.
- Added a new job, `mark-stale`, to mark the Cypress status as stale
when the label is absent.
- **Improvements**
- Updated the `parse-tags` job to run only after the `checkTestLabel`
job, enhancing workflow control.
- Modified the conditions for executing the `parse-tags` job based on
the output of the `checkTestLabel` job.
- **Style**
	- Minor formatting adjustments for job dependencies in the workflow.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-12 11:24:49 +05:30
Valera Melnikov
8bf6df5272
fix: test storybook action (#35585)
## Description
Example of a successful pass:

https://github.com/appsmithorg/appsmith/actions/runs/10321826794/job/28575617540

## Automation

/ok-to-test tags=""

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!CAUTION]  
> If you modify the content in this section, you are likely to disrupt
the CI result for your PR.

<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Chores**
- Streamlined GitHub Actions workflow for testing Storybook by
consolidating Playwright installation and removing redundant steps.
	- Enhanced clarity and efficiency of the testing process.
- **Style**
- Updated button component styles by disabling rounded corners,
reflecting a potential shift in design strategy.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-09 20:46:25 +03:00
Nikhil Nandagopal
e34af544a1 Updated Label Config 2024-08-09 19:30:12 +05:30
Sagar Khalasi
92b8f81235
test: Testing pipeline with build yaml and run_count (#35524)
## Description
Testing the yaml with slash command.

Fixes #`34956`  


## Automation

/ok-to-test tags="@tag.Sanity"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/10316110580>
> Commit: 41a74c726e332c4d9adeef876d60766f0c09c33a
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10316110580&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Fri, 09 Aug 2024 08:43:58 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit


## Summary by CodeRabbit

- **Chores**
- Updated the GitHub Actions workflow to disable Yarn cache restoration,
which may affect build times.
- Modified Cypress test specifications to focus on the Fork application
instead of templates, refining test execution priorities.
- Enhanced the GitHub Actions workflow with a new input parameter,
`run_count`, improving configurability and responsiveness to events.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-09 14:25:24 +05:30
Nikhil Nandagopal
5acc392031 Updated Label Config 2024-08-07 17:54:19 +05:30
Nikhil Nandagopal
b346cbe2c9
Update config.json 2024-08-07 17:33:18 +05:30
Nikhil Nandagopal
8c950dbeb7
Update config.json 2024-08-07 17:03:50 +05:30
Nikhil Nandagopal
d693af7160
Update config.json 2024-08-07 17:00:46 +05:30
Nikhil Nandagopal
aab81dbb95 Updated Label Config 2024-08-07 17:00:22 +05:30
Nikhil Nandagopal
a4d2562ba6
Update config.json 2024-08-07 16:49:53 +05:30
Hetu Nandu
0b1bcf2bef Revert "Add a generic label check step"
This reverts commit 6d5dacdd96.
2024-08-07 12:06:43 +05:30
Hetu Nandu
f1190d2f79 Merge branch 'refs/heads/release' into chore/ok-to-test-push 2024-08-07 11:53:17 +05:30
Hetu Nandu
6d5dacdd96 Add a generic label check step 2024-08-07 11:52:42 +05:30
Nikhil Nandagopal
57a8e83b4a Updated Label Config 2024-08-06 22:44:02 +05:30
yatinappsmith
b3c35e9e68
CI: commented files changed step. It is a notification step (#35460)
commented files changed step. It is a notification step

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Chores**
- Modified the GitHub Actions workflow to simplify job flow by
commenting out the command execution for changes in the client folder,
effectively disabling that functionality.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-08-06 19:35:30 +05:30
Nikhil Nandagopal
c042f94bed Updated Label Config 2024-08-06 19:28:18 +05:30
Nikhil Nandagopal
2ed8aa82d5 Updated Label Config 2024-08-06 19:25:13 +05:30
Nikhil Nandagopal
cacdf90016 Updated Label Config 2024-08-06 19:19:26 +05:30
Nikhil Nandagopal
c9ecddcc47 Updated Label Config 2024-08-06 19:16:33 +05:30
Nikhil Nandagopal
2234b33181 Updated Label Config 2024-08-06 19:16:20 +05:30
Nikhil Nandagopal
73c68f4736 Updated Label Config 2024-08-06 17:23:52 +05:30
Nikhil Nandagopal
82d9095961 Updated Label Config 2024-08-06 16:44:07 +05:30
Nikhil Nandagopal
e7379710ee Updated Label Config 2024-08-06 16:43:51 +05:30
Nikhil Nandagopal
cbb45686be Updated Label Config 2024-08-06 15:41:04 +05:30
Nikhil Nandagopal
8543ab9992 Updated Label Config 2024-08-06 15:36:24 +05:30
Nikhil Nandagopal
fe894bb0e3 Updated Label Config 2024-08-06 15:19:52 +05:30
Nikhil Nandagopal
3527930c8d Updated Label Config 2024-08-06 15:18:52 +05:30
Nikhil Nandagopal
4346076326 Updated Label Config 2024-08-06 15:15:57 +05:30
Nikhil Nandagopal
f8444011b2 Updated Label Config 2024-08-06 14:55:59 +05:30
Nikhil Nandagopal
162592056e Updated Label Config 2024-08-06 14:37:11 +05:30
Nikhil Nandagopal
b01dc9deff Updated Label Config 2024-08-06 14:36:14 +05:30
Nikhil Nandagopal
eea603c423 Updated Label Config 2024-08-06 14:35:46 +05:30
Nikhil Nandagopal
26fa7324a6 Updated Label Config 2024-08-06 14:34:03 +05:30
Nikhil Nandagopal
697189cff3 Updated Label Config 2024-08-06 14:33:44 +05:30
Nikhil Nandagopal
670842907e Updated Label Config 2024-08-06 14:31:04 +05:30
Nikhil Nandagopal
309fe3f17f Updated Label Config 2024-08-06 14:30:52 +05:30
Nikhil Nandagopal
f46aac33fc Updated Label Config 2024-08-06 14:21:56 +05:30