Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/workflows/test-build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ on:
type: string
default: latest

# trigger for pushes to master
# trigger for pushes to master and pg
push:
branches: [master]
branches: [master, pg]
paths:
- "app/client/**"
- "app/server/**"
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
ci-test:
needs: [setup, build-docker-image]
# Only run if the build step is successful
if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
name: ci-test
uses: ./.github/workflows/ci-test-custom-script.yml
secrets: inherit
Expand All @@ -113,7 +113,7 @@ jobs:
server-unit-tests:
name: server-unit-tests
needs: [build-docker-image]
if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
uses: ./.github/workflows/server-build.yml
secrets: inherit
with:
Expand All @@ -123,7 +123,7 @@ jobs:
client-unit-tests:
name: client-unit-tests
needs: [build-docker-image]
if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
uses: ./.github/workflows/client-unit-tests.yml
secrets: inherit
with:
Expand Down Expand Up @@ -341,6 +341,12 @@ jobs:
scripts/generate_info_json.sh
fi

- name: Place server artifacts-es
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this step?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for placing the artifacts in required location. This won't have any effect in release branch though as the file itself is not present.

run: |
if [[ -f scripts/prepare_server_artifacts.sh ]]; then
scripts/prepare_server_artifacts.sh
fi

- name: Set up Depot CLI
uses: depot/setup-action@v1

Expand All @@ -362,7 +368,7 @@ jobs:
APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com
BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:release
tags: |
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:release
${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{ github.ref_name }}

package-master:
needs: [ci-test, client-unit-tests, server-unit-tests]
Expand Down