Skip to content

Commit 9624492

Browse files
Shivam-zShivam-z
authored
Merge branch 'release' into fix/image-not-downloading
2 parents f573bd6 + ba6fd9b commit 9624492

File tree

4,987 files changed

+163128
-49222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,987 files changed

+163128
-49222
lines changed

‎.coderabbit.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
2+
language: "en-US"
3+
early_access: false
4+
tone_instructions: 'You must talk like teacher.'
5+
reviews:
6+
profile: "chill"
7+
request_changes_workflow: false
8+
high_level_summary: true
9+
poem: true
10+
review_status: true
11+
collapse_walkthrough: false
12+
auto_review:
13+
enabled: true
14+
drafts: false
15+
path_instructions:
16+
- path: "app/client/cypress/**/**.*"
17+
instructions: |
18+
Review the following e2e test code written using the Cypress test library. Ensure that:
19+
- Follow best practices for Cypress code and e2e automation.
20+
- Avoid using cy.wait in code.
21+
- Avoid using cy.pause in code.
22+
- Avoid using agHelper.sleep().
23+
- Use locator variables for locators and do not use plain strings.
24+
- Use data-* attributes for selectors.
25+
- Avoid Xpaths, Attributes and CSS path.
26+
- Avoid selectors like .btn.submit or button[type=submit].
27+
- Perform logins via API with LoginFromAPI.
28+
- Perform logout via API with LogOutviaAPI.
29+
- Perform signup via API with SignupFromAPI.
30+
- Avoid using it.only.
31+
- Avoid using after and aftereach in test cases.
32+
- Use multiple assertions for expect statements.
33+
- Avoid using strings for assertions.
34+
- Do not use duplicate filenames even with different paths.
35+
- Avoid using agHelper.Sleep, this.Sleep in any file in code.
36+
chat:
37+
auto_reply: true

‎.github/config.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎.github/workflows/ad-hoc-docker-image.yml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
name: Ad-hoc Docker Image
2+
3+
on:
4+
# This line enables manual triggering of this workflow.
5+
workflow_dispatch:
6+
inputs:
7+
branch:
8+
description: Branch to build image out of
9+
required: false
10+
type: string
11+
default: master
12+
tag:
13+
description: Tag to use for image
14+
required: false
15+
type: string
16+
default: ad-hoc
17+
18+
jobs:
19+
server-build:
20+
name: server-build
21+
uses: ./.github/workflows/server-build.yml
22+
secrets: inherit
23+
with:
24+
branch: ${{ inputs.branch }}
25+
skip-tests: true
26+
27+
client-build:
28+
name: client-build
29+
uses: ./.github/workflows/client-build.yml
30+
secrets: inherit
31+
with:
32+
branch: ${{ inputs.branch }}
33+
34+
rts-build:
35+
name: rts-build
36+
uses: ./.github/workflows/rts-build.yml
37+
secrets: inherit
38+
with:
39+
branch: ${{ inputs.branch }}
40+
41+
package:
42+
needs: [server-build, client-build, rts-build]
43+
runs-on: ubuntu-latest
44+
# Set permissions since we're using OIDC token authentication between Depot and GitHub
45+
permissions:
46+
contents: read
47+
id-token: write
48+
49+
steps:
50+
# Check out the specified branch in case this workflow is called by another workflow
51+
- name: Checkout the specified branch
52+
uses: actions/checkout@v4
53+
with:
54+
fetch-tags: true
55+
ref: ${{ inputs.branch }}
56+
57+
- name: Download the react build artifact
58+
uses: actions/download-artifact@v4
59+
with:
60+
name: client-build
61+
path: app/client
62+
63+
- name: Unpack the client build artifact
64+
if: steps.run_result.outputs.run_result != 'success'
65+
run: |
66+
mkdir -p app/client/build
67+
tar -xvf app/client/build.tar -C app/client/build
68+
69+
- name: Download the server build artifact
70+
uses: actions/download-artifact@v4
71+
with:
72+
name: server-build
73+
path: app/server/dist
74+
75+
- name: Download the rts build artifact
76+
uses: actions/download-artifact@v4
77+
with:
78+
name: rts-dist
79+
path: app/client/packages/rts/dist
80+
81+
- name: Untar the rts folder
82+
run: |
83+
tar -xvf app/client/packages/rts/dist/rts-dist.tar -C app/client/packages/rts/
84+
echo "Cleaning up the tar files"
85+
rm app/client/packages/rts/dist/rts-dist.tar
86+
87+
- name: Generate info.json
88+
run: |
89+
if [[ -f scripts/generate_info_json.sh ]]; then
90+
scripts/generate_info_json.sh
91+
fi
92+
93+
- name: Set up Depot CLI
94+
uses: depot/setup-action@v1
95+
96+
- name: Login to DockerHub
97+
uses: docker/login-action@v3
98+
with:
99+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
100+
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
101+
102+
- name: Build and push environment specific image to Docker Hub
103+
if: success()
104+
uses: depot/build-push-action@v1
105+
with:
106+
context: .
107+
push: true
108+
platforms: linux/arm64,linux/amd64
109+
build-args: |
110+
APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }}
111+
BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:nightly
112+
tags: |
113+
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{ inputs.tag }}

0 commit comments

Comments
 (0)