diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index cedac1f84817..4414fa5ab92d 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -22,11 +22,16 @@ jobs: steps: - name: Environment details run: | + echo ${{ secrets.DOCKER_HUB_USERNAME }} echo "PWD: $PWD" echo "GITHUB_REF: $GITHUB_REF" echo "GITHUB_SHA: $GITHUB_SHA" echo "GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME" - + - name: Login to DockerHub + uses: docker/login-action@v3.3.0 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Get the version id: get_version run: | @@ -40,7 +45,7 @@ jobs: needs: - prelude - runs-on: ubuntu-latest-4-cores + runs-on: ubuntu-latest defaults: run: @@ -209,8 +214,8 @@ jobs: - name: Checkout the merged commit from PR and base branch uses: actions/checkout@v4 - - name: Set up Depot CLI - uses: depot/setup-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Download the client build artifact uses: actions/download-artifact@v4 @@ -247,31 +252,27 @@ jobs: run: | scripts/generate_info_json.sh - # As pg docker image is continuously updated for each scheduled cron on release, we are using the nightly tag while building the latest tag - name: Place server artifacts-es run: | if [[ -f scripts/prepare_server_artifacts.sh ]]; then - PG_TAG=nightly scripts/prepare_server_artifacts.sh - else - echo "No script found to prepare server artifacts" - exit 1 + scripts/prepare_server_artifacts.sh fi - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - name: Build and push fat image - uses: depot/build-push-action@v1 + - name: Build and push Docker image + uses: docker/build-push-action@v3 with: context: . push: true platforms: linux/arm64,linux/amd64 build-args: | APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} - BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:nightly + BASE=appsmith/base-${{ vars.EDITION }}:nightly tags: | - ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{needs.prelude.outputs.tag}} - ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:latest + ${{ secrets.DOCKER_HUB_USERNAME }}/appsmith-${{ vars.EDITION }}:${{needs.prelude.outputs.tag}} + ${{ secrets.DOCKER_HUB_USERNAME }}/appsmith-${{ vars.EDITION }}:latest \ No newline at end of file diff --git a/app/client/.husky/check-staged-files.sh b/app/client/.husky/check-staged-files.sh index cf456b2339c6..9fbdbb9cc7d9 100644 --- a/app/client/.husky/check-staged-files.sh +++ b/app/client/.husky/check-staged-files.sh @@ -30,8 +30,8 @@ else echo "Skipping server side check..." fi - if [ "$is_client_change" -ge 1 ]; then - echo "Running client check..." + if [ "$is_client_change" -ge 1 ]; then + echo "Running client check ..." npx lint-staged --cwd app/client else echo "Skipping client side check..." diff --git a/app/client/package.json b/app/client/package.json index a8dbd7685119..6e1afd95e014 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -17,7 +17,7 @@ ], "scripts": { "analyze": "yarn cra-bundle-analyzer", - "start": "BROWSER=none REACT_APP_ENVIRONMENT=DEVELOPMENT REACT_APP_CLIENT_LOG_LEVEL=debug HOST=dev.appsmith.com craco --max_old_space_size=4096 start", + "start": "BROWSER=none EXTEND_ESLINT=true REACT_APP_ENVIRONMENT=DEVELOPMENT REACT_APP_CLIENT_LOG_LEVEL=debug HOST=0.0.0.0 craco --max_old_space_size=7168 start", "build": "./build.sh", "build-airgap": "node download-assets.js && ./build.sh", "build-local": "craco --max-old-space-size=4096 build --config craco.build.config.js", diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts index 497222db194d..08d52b3f8a0a 100644 --- a/app/client/src/sagas/InitSagas.ts +++ b/app/client/src/sagas/InitSagas.ts @@ -71,7 +71,7 @@ import { fetchFeatureFlagsInit, fetchProductAlertInit, } from "actions/userActions"; -import { embedRedirectURL, validateResponse } from "./ErrorSagas"; +import { validateResponse } from "./ErrorSagas"; import type { ApiResponse } from "api/ApiResponses"; import type { ProductAlert } from "reducers/uiReducers/usersReducer"; import type { FeatureFlags } from "ee/entities/FeatureFlag";