ci: Use vars.EDITION instead of hard-coded edition to avoid conflicts with EE sync (#25870)

Note: Please review/approve only, do not merge. This PR is expected to
cause conflicts and so I'd like to be around when this is merged.
This commit is contained in:
Shrikant Sharat Kandula 2023-08-02 14:35:08 +05:30 committed by GitHub
parent b93dcc4b84
commit e0962f3a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

View File

@ -267,7 +267,7 @@ jobs:
build-args: |
APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }}
tags: |
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{needs.prelude.outputs.tag}}
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{needs.prelude.outputs.tag}}
# Only build & tag with latest if the tag doesn't contain beta
- name: Build and push fat image latest
@ -280,4 +280,4 @@ jobs:
build-args: |
APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }}
tags: |
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:latest
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:latest

View File

@ -183,7 +183,7 @@ jobs:
APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com
outputs:
imageHash: ce-${{ github.event.client_payload.pull_request.number }}
imageHash: ${{ vars.EDITION }}-${{ github.event.client_payload.pull_request.number }}
build-deploy-preview:
needs: [push-image]
@ -249,4 +249,4 @@ jobs:
with:
issue-number: ${{ github.event.client_payload.pull_request.number }}
body: |
Deploy-Preview-URL: https://ce-${{ github.event.client_payload.pull_request.number }}.dp.appsmith.com
Deploy-Preview-URL: https://${{ vars.EDITION }}-${{ github.event.client_payload.pull_request.number }}.dp.appsmith.com

View File

@ -202,7 +202,7 @@ jobs:
APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }}
APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com
tags: |
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:release
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:release
package-master:
needs: ci-test
@ -269,5 +269,5 @@ jobs:
build-args: |
APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }}
tags: |
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{ github.sha }}
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:nightly
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{ github.sha }}
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:nightly