Skip to content

Commit

Permalink
Merge pull request #1820 from appsmithorg/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
mohanarpit authored Nov 20, 2020
2 parents 2489754 + ff541c3 commit 2a3f8d9
Show file tree
Hide file tree
Showing 137 changed files with 2,577 additions and 1,056 deletions.
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,8 @@ APPSMITH_MAIL_SMTP_TLS_ENABLED=
# Disable all telemetry
# Note: This only takes effect in self-hosted scenarios.
# Please visit: https://docs.appsmith.com/telemetry/telemetry to read more about anonymized data collected by Appsmith
# APPSMITH_DISABLE_TELEMETRY=false
# APPSMITH_DISABLE_TELEMETRY=false

#APPSMITH_SENTRY_DSN=
#APPSMITH_SENTRY_ENVIRONMENT=

28 changes: 28 additions & 0 deletions .github/release-drafter-template.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name-template: 'Release v$RESOLVED_VERSION 🌈'
tag-template: 'v$RESOLVED_VERSION'
categories:
- title: '🚀 Features'
labels:
- 'Enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'Bug'
- title: '📙 Documentation'
label: 'Documentation'
change-template: '- $TITLE (#$NUMBER)'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- 'Major'
minor:
labels:
- 'Minor'
patch:
labels:
- 'Patch'
default: patch
template: |
## What's new?
$CHANGES
2 changes: 1 addition & 1 deletion .github/workflows/duplicate-issue-detector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# Get issues with state to compare. Supported state: 'all', 'closed', 'open'.
state: open
# If similarity is higher than this threshold([0,1]), issue will be marked as duplicate.
threshold: 0.6
threshold: 0.8
# Reactions to be add to comment when potential duplicates are detected.
# Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes"
reactions: 'confused'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ jobs:
# Build Docker image and push to Docker Hub
- name: Push image to Docker Hub
run: |
docker build -t appsmith/appsmith-server:${{steps.get_version.outputs.tag}} .
docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:${{steps.get_version.outputs.tag}} .
# Only build & tag with latest if the tag doesn't contain beta
if [[ ! ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then
docker build -t appsmith/appsmith-server:latest .
docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:latest .
fi
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Release Drafter

on:
push:
branches:
- release
# Only trigger if files have changed in this specific path
paths:
- 'app/client/**'
- 'app/server/**'


jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
with:
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
config-name: release-drafter-template.yml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Push release image to Docker Hub
if: success() && github.ref == 'refs/heads/release'
run: |
docker build -t appsmith/appsmith-server:${{steps.vars.outputs.tag}} .
docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:${{steps.vars.outputs.tag}} .
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
# This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful
# with this command
Expand All @@ -81,8 +81,8 @@ jobs:
- name: Push master image to Docker Hub with commit tag
if: success() && github.ref == 'refs/heads/master'
run: |
docker build -t appsmith/appsmith-server:${GITHUB_SHA} .
docker build -t appsmith/appsmith-server:nightly .
docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:${GITHUB_SHA} .
docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:nightly .
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
# This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful
# with this command
Expand Down
103 changes: 103 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"name": "Appsmith",
"description": "Appsmith is an open-source platform to build and deploy internal tools or admin panels.",
"keywords": [
"java",
"react",
"admin"
],
"addons": [
{
"plan": "heroku-redis:hobby-dev",
"as": "APPSMITH_REDIS"
}
],

"website": "https://appsmith.com/",
"logo": "https://raw.githubusercontent.com/appsmithorg/appsmith/release/static/logo.png",
"success_url": "/",
"stack": "container",
"env": {
"APPSMITH_MONGODB_URI": {
"description": "Your Mongo Database URI",
"value": ""
},
"APPSMITH_ENCRYPTION_PASSWORD": {
"description": "Encryption password to encrypt all credentials in the database",
"value": ""
},
"APPSMITH_ENCRYPTION_SALT": {
"description" : "Encryption salt used to encrypt all credentials in the database",
"value": ""
},
"APPSMITH_MAIL_ENABLED": {
"description" : "Set this value to true to enable email sending",
"value": "false",
"required": false
},
"APPSMITH_MAIL_FROM": {
"description" : "Email ID using which emails will be sent from your installation ",
"value": "",
"required": false
},
"APPSMITH_REPLY_TO": {
"description" : "Email ID to which all email replies will be sent to",
"value": "",
"required": false
},
"APPSMITH_MAIL_HOST": {
"description" : "The host endpoint for the SMTP server",
"value": "",
"required": false
},
"APPSMITH_MAIL_SMTP_TLS_ENABLED" : {
"description": "Set this value to enable TLS for your SMTP server",
"value": "",
"required": false
},
"APPSMITH_MAIL_USERNAME": {
"description" : "SMTP username",
"value": "",
"required": false
},
"APPSMITH_MAIL_PASSWORD": {
"description" : "SMTP password",
"value": "",
"required": false
},
"APPSMITH_MAIL_SMTP_AUTH" : {
"description" : "Set this value to true if your SMTP server requires authentication",
"value": "",
"required": false
},
"APPSMITH_OAUTH2_GOOGLE_CLIENT_ID": {
"description": "Client ID provided by Google for OAuth2 login",
"value": "",
"required": false
},
"APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET": {
"description" : "Client secret provided by Google for OAuth2 login",
"value": "",
"required": false
},
"APPSMITH_OAUTH2_GITHUB_CLIENT_ID": {
"description" : "Client ID provided by Github for OAuth2 login",
"value": "",
"required": false
},
"APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET": {
"description" : "Client secret provided by Github for OAuth2 login",
"value": "",
"required": false
},
"APPSMITH_GOOGLE_MAPS_API_KEY": {
"description" : "Google Maps API key which is required if you wish to leverage Google Maps widget. Read more at: https://docs.appsmith.com/third-party-services/google-maps",
"value": "",
"required": false
},
"APPSMITH_DISABLE_TELEMETRY": {
"description" : "We want to be transparent and request that you share anonymous usage data with us. This data is purely statistical in nature and helps us understand your needs & provide better support to your self-hosted instance. You can read more about what information is collected in our documentation https://docs.appsmith.com/telemetry/telemetry",
"value": "false"
}
}
}
12 changes: 6 additions & 6 deletions app/client/cypress/fixtures/ChartTextDsl.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"version": 4,
"minHeight": 1292,
"parentColumnSpace": 1,
Expand All @@ -28,7 +28,7 @@
"isLoading": false,
"parentColumnSpace": 75.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 0,
"rightColumn": 8,
"topRow": 0,
Expand Down Expand Up @@ -71,7 +71,7 @@
"bottomRow": 8,
"parentId": "56c5odk5ic",
"widgetId": "64jukpgbzh",
"dynamicBindings": {}
"dynamicBindingPathList": []
}
],
"widgetId": "56c5odk5ic",
Expand All @@ -90,7 +90,7 @@
"isLoading": false,
"parentColumnSpace": 75.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 0,
"rightColumn": 16,
"topRow": 9,
Expand Down Expand Up @@ -130,7 +130,7 @@
"bottomRow": 3,
"parentId": "d2i9xsy2fk",
"widgetId": "u210slvpsz",
"dynamicBindings": {}
"dynamicBindingPathList": []
}
],
"widgetId": "d2i9xsy2fk",
Expand All @@ -149,7 +149,7 @@
"isLoading": false,
"parentColumnSpace": 75.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 8,
"rightColumn": 16,
"topRow": 0,
Expand Down
6 changes: 3 additions & 3 deletions app/client/cypress/fixtures/Js_toggle_dsl.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"version": 6,
"minHeight": 1292,
"parentColumnSpace": 1,
Expand All @@ -36,7 +36,7 @@
"bottomRow": 2,
"parentId": "0",
"widgetId": "p4777z9d4u",
"dynamicProperties": {}
"dynamicPropertyPathList": []
},
{
"isVisible": true,
Expand Down Expand Up @@ -71,7 +71,7 @@
"bottomRow": 2,
"parentId": "0",
"widgetId": "cxum96myhf",
"dynamicBindings": {}
"dynamicBindingPathList": []
}
]
},
Expand Down
18 changes: 9 additions & 9 deletions app/client/cypress/fixtures/Mapdsl.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"version": 4,
"minHeight": 1292,
"parentColumnSpace": 1,
Expand All @@ -28,7 +28,7 @@
"isLoading": false,
"parentColumnSpace": 75.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 0,
"rightColumn": 8,
"topRow": 0,
Expand Down Expand Up @@ -61,7 +61,7 @@
"isLoading": false,
"parentColumnSpace": 35.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 0,
"rightColumn": 3,
"topRow": 0,
Expand All @@ -85,7 +85,7 @@
"isLoading": false,
"parentColumnSpace": 75.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 0,
"rightColumn": 16,
"topRow": 9,
Expand Down Expand Up @@ -118,7 +118,7 @@
"isLoading": false,
"parentColumnSpace": 72.875,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 0,
"rightColumn": 3,
"topRow": 0,
Expand Down Expand Up @@ -148,7 +148,7 @@
"bottomRow": 12,
"parentId": "yt4ouwn0sk",
"widgetId": "673etzjyv9",
"dynamicBindings": {}
"dynamicBindingPathList": []
}
],
"widgetId": "yt4ouwn0sk",
Expand All @@ -167,7 +167,7 @@
"isLoading": false,
"parentColumnSpace": 75.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 8,
"rightColumn": 16,
"topRow": 0,
Expand Down Expand Up @@ -200,7 +200,7 @@
"isLoading": false,
"parentColumnSpace": 35.25,
"parentRowSpace": 38,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"leftColumn": 0,
"rightColumn": 3,
"topRow": 0,
Expand All @@ -218,4 +218,4 @@
]
},
"layoutOnLoadActions": []
}
}
4 changes: 2 additions & 2 deletions app/client/cypress/fixtures/MultipleInput.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"dynamicBindings": {},
"dynamicBindingPathList": [],
"version": 6,
"minHeight": 1292,
"parentColumnSpace": 1,
Expand Down Expand Up @@ -69,4 +69,4 @@
}
]
}
}
}
Loading

0 comments on commit 2a3f8d9

Please sign in to comment.