From 626a46b1ddd623c8a35b4b52799338d5e935edc1 Mon Sep 17 00:00:00 2001 From: Haj Rezvan Date: Tue, 8 Oct 2024 19:09:23 +0330 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=90=9B=20Debug=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-release.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index cedac1f8481..71be8286d9d 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: @@ -200,7 +205,7 @@ jobs: package: needs: [prelude, client-build, server-build, rts-build] - runs-on: ubuntu-latest + runs-on: depot-ubuntu-22.04 permissions: contents: read id-token: write @@ -247,14 +252,10 @@ 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 @@ -271,7 +272,7 @@ jobs: 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 From 808a5531835caec6678ea42cf2c33591258c4371 Mon Sep 17 00:00:00 2001 From: Haj Rezvan Date: Tue, 8 Oct 2024 19:25:52 +0330 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=94=A7=20Change=20depot=20to=20docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 71be8286d9d..fac9fbc0b4d 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -259,13 +259,13 @@ jobs: 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 + uses: docker/build-push-action@v3 with: context: . push: true From dd9c9c72565627290badd2c832ee545768732c1b Mon Sep 17 00:00:00 2001 From: Haj Rezvan Date: Tue, 8 Oct 2024 19:26:54 +0330 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=90=9B=20change=20depot-ubuntu=20to?= =?UTF-8?q?=20ubuntu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index fac9fbc0b4d..d79aaf985ba 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -205,7 +205,7 @@ jobs: package: needs: [prelude, client-build, server-build, rts-build] - runs-on: depot-ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: read id-token: write From b840761a25c09b10cfe45a800b9942f7053a7635 Mon Sep 17 00:00:00 2001 From: Haj Rezvan Date: Tue, 8 Oct 2024 19:28:06 +0330 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=90=9B=20change=20depot=20to=20docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index d79aaf985ba..b76de61c9f6 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -214,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 From 2f773fa5db101f607e10a6077346afdfb8cbd378 Mon Sep 17 00:00:00 2001 From: Haj Rezvan Date: Tue, 8 Oct 2024 19:31:52 +0330 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=94=A7=20change=20depot=20to=20docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 71be8286d9d..0721e385461 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -205,7 +205,7 @@ jobs: package: needs: [prelude, client-build, server-build, rts-build] - runs-on: depot-ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: read id-token: write @@ -214,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 @@ -264,8 +264,8 @@ jobs: 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 From 0277e6a0292bde988531ae5592c8f74cc69ffb2a Mon Sep 17 00:00:00 2001 From: Haj Rezvan Date: Tue, 8 Oct 2024 19:32:11 +0330 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=94=A7=20a=20bit=20change?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 0721e385461..4414fa5ab92 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -259,7 +259,7 @@ jobs: 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 }} From 92a2c05aa9aa8bb48f9694aceef68aa09e4e60cd Mon Sep 17 00:00:00 2001 From: hossein heydari Date: Tue, 20 Feb 2024 13:43:42 +0330 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=90=9B:=20change=20many=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/client/.husky/check-staged-files.sh | 4 ++-- app/client/package.json | 2 +- app/client/src/sagas/InitSagas.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/client/.husky/check-staged-files.sh b/app/client/.husky/check-staged-files.sh index cf456b2339c..9fbdbb9cc7d 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 a8dbd768511..6e1afd95e01 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 497222db194..08d52b3f8a0 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";