From d6475010b0237f392f3784cd02c707563474ea75 Mon Sep 17 00:00:00 2001 From: Adish M <44204658+adishM98@users.noreply.github.com> Date: Thu, 10 Jul 2025 12:48:17 +0530 Subject: [PATCH 1/6] Created a new automation for deploying prod frontend to Netlify (#13304) --- .github/workflows/cloud-frontend-gcp.yml | 133 +++++++++++++++++++++++ .github/workflows/cloud-frontend.yml | 30 ++--- 2 files changed, 148 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/cloud-frontend-gcp.yml diff --git a/.github/workflows/cloud-frontend-gcp.yml b/.github/workflows/cloud-frontend-gcp.yml new file mode 100644 index 0000000000..12deb9c653 --- /dev/null +++ b/.github/workflows/cloud-frontend-gcp.yml @@ -0,0 +1,133 @@ +name: Deploy to cloud frontend stage + +on: + workflow_dispatch: + inputs: + branch: + description: 'Git branch to deploy (must start with "lts-", e.g., lts-3.6)' + required: true + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: ✅ Check user authorization + run: | + allowed_user1=${{ secrets.ALLOWED_USER1_USERNAME }} + allowed_user2=${{ secrets.ALLOWED_USER2_USERNAME }} + allowed_user3=${{ secrets.ALLOWED_USER3_USERNAME }} + + if [[ "${{ github.actor }}" != "$allowed_user1" && \ + "${{ github.actor }}" != "$allowed_user2" && \ + "${{ github.actor }}" != "$allowed_user3" ]]; then + echo "❌ User '${{ github.actor }}' is not authorized to trigger this workflow." + exit 1 + else + echo "✅ User '${{ github.actor }}' is authorized." + fi + + - name: 📥 Manual Git checkout with submodules + run: | + set -e + + BRANCH="${{ github.event.inputs.branch }}" + REPO="https://x-access-token:${{ secrets.CUSTOM_GITHUB_TOKEN }}@github.com/${{ github.repository }}" + + git config --global url."https://x-access-token:${{ secrets.CUSTOM_GITHUB_TOKEN }}@github.com/".insteadOf "https://github.com/" + git config --global http.version HTTP/1.1 + git config --global http.postBuffer 524288000 + + echo "👉 Cloning $REPO (branch: $BRANCH)" + git clone --recurse-submodules --depth=1 --branch "$BRANCH" "$REPO" repo + cd repo + + echo "🔁 Updating submodules" + git submodule update --init --recursive + + echo "🔀 Attempting to checkout '$BRANCH' in each submodule and validating" + + BRANCH="$BRANCH" git submodule foreach --recursive bash -c ' + name="$sm_path" + echo "" + echo "Entering '\''$name'\''" + echo "↪ $name: trying to checkout branch '\''$BRANCH'\''" + + if git ls-remote --exit-code --heads origin "$BRANCH" >/dev/null; then + git fetch origin "$BRANCH:$BRANCH" || { + echo "❌ $name: fetch failed for $BRANCH" + exit 1 + } + + PREV=$(git rev-parse --short HEAD || echo "unknown") + git checkout "$BRANCH" || { + echo "❌ $name: checkout failed for $BRANCH" + exit 1 + } + + echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')" + echo "✅ $name: checked out branch $BRANCH" + else + echo "⚠️ $name: branch '$BRANCH' not found on origin. Falling back to 'main'" + PREV=$(git rev-parse --short HEAD || echo "unknown") + git checkout main && git pull origin main || { + echo "❌ $name: fallback to main failed" + exit 1 + } + echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')" + echo "✅ $name: now on branch main" + fi + + CURRENT=$(git rev-parse --abbrev-ref HEAD) + echo "🔎 $name: current branch = $CURRENT" + if [ "$CURRENT" != "$BRANCH" ] && [ "$CURRENT" != "main" ]; then + echo "❌ $name: unexpected branch state — wanted '$BRANCH' or fallback 'main', got '$CURRENT'" + exit 1 + fi + ' + + - name: 🧰 Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: 22.15.1 + + - name: 📦 Install dependencies + run: npm install + working-directory: repo + + - name: 🛠️ Build the project + run: npm run build:plugins:prod && npm run build:frontend + working-directory: repo + env: + GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }} + NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }} + NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }} + SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }} + SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }} + SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }} + SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }} + SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }} + TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }} + TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }} + TOOLJET_EDITION: cloud + WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account + + - name: 🚀 Deploy to Netlify + run: | + npm install -g netlify-cli + netlify deploy --prod --dir=frontend/build --auth=$NETLIFY_AUTH_TOKEN --site=${{ secrets.CLOUD_NETLIFY_SITE_ID }} + working-directory: repo + env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }} + NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }} + NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }} + SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }} + SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }} + SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }} + SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }} + SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }} + TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }} + TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }} + WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account + TOOLJET_EDITION: cloud diff --git a/.github/workflows/cloud-frontend.yml b/.github/workflows/cloud-frontend.yml index 71e100c52d..35d13aaa40 100644 --- a/.github/workflows/cloud-frontend.yml +++ b/.github/workflows/cloud-frontend.yml @@ -99,35 +99,35 @@ jobs: run: npm run build:plugins:prod && npm run build:frontend working-directory: repo env: - GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }} + GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_PROD_CLOUD_GOOGLE_MAPS_API_KEY }} NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }} NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }} - SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }} - SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }} - SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }} - SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }} - SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }} + SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_PROD_CLOUD_SENTRY_AUTH_TOKEN }} + SENTRY_ORG: ${{ secrets.CLOUD_PROD_CLOUD_SENTRY_ORG }} + SENTRY_PROJECT: ${{ secrets.CLOUD_PROD_CLOUD_SENTRY_PROJECT }} + SERVE_CLIENT: ${{ secrets.CLOUD_PROD_CLOUD_SERVE_CLIENT }} + SERVER_IP: ${{ secrets.CLOUD_PROD_CLOUD_SERVER_IP }} TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }} TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }} + WEBSITE_SIGNUP_URL: https://tooljet.ai/ai-create-account TOOLJET_EDITION: cloud - WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account - name: 🚀 Deploy to Netlify run: | npm install -g netlify-cli - netlify deploy --prod --dir=frontend/build --auth=$NETLIFY_AUTH_TOKEN --site=${{ secrets.CLOUD_NETLIFY_SITE_ID }} + netlify deploy --prod --dir=frontend/build --auth=$NETLIFY_AUTH_TOKEN --site=${{ secrets.CLOUD_PROD_NETLIFY_SITE_ID }} working-directory: repo env: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} - GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }} + GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_PROD_CLOUD_GOOGLE_MAPS_API_KEY }} NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }} NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }} - SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }} - SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }} - SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }} - SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }} - SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }} + SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_PROD_CLOUD_SENTRY_AUTH_TOKEN }} + SENTRY_ORG: ${{ secrets.CLOUD_PROD_CLOUD_SENTRY_ORG }} + SENTRY_PROJECT: ${{ secrets.CLOUD_PROD_CLOUD_SENTRY_PROJECT }} + SERVE_CLIENT: ${{ secrets.CLOUD_PROD_CLOUD_SERVE_CLIENT }} + SERVER_IP: ${{ secrets.CLOUD_PROD_CLOUD_SERVER_IP }} TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }} TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }} - WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account + WEBSITE_SIGNUP_URL: https://tooljet.ai/ai-create-account TOOLJET_EDITION: cloud From f4244a36c6e829b473077aef60c204b7990e727e Mon Sep 17 00:00:00 2001 From: Adish M Date: Thu, 10 Jul 2025 14:50:57 +0530 Subject: [PATCH 2/6] Cloud imgration issue fix --- ...1750927057649-AddAiGenerationFlagsInApp.ts | 62 -------------- .../1750927083207-AddArtifactsTable.ts | 81 ------------------- 2 files changed, 143 deletions(-) delete mode 100644 server/data-migrations/1750927057649-AddAiGenerationFlagsInApp.ts delete mode 100644 server/data-migrations/1750927083207-AddArtifactsTable.ts diff --git a/server/data-migrations/1750927057649-AddAiGenerationFlagsInApp.ts b/server/data-migrations/1750927057649-AddAiGenerationFlagsInApp.ts deleted file mode 100644 index 3205c9979b..0000000000 --- a/server/data-migrations/1750927057649-AddAiGenerationFlagsInApp.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { MigrationInterface, QueryRunner, TableColumn } from "typeorm"; - -export class AddAiGenerationFlagsInApp1750927057649 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - // Add is_initialised_from_prompt column - await queryRunner.addColumn( - 'apps', - new TableColumn({ - name: 'is_initialised_from_prompt', - type: 'boolean', - default: false, - isNullable: false, - }) - ); - - // Add app_generated_from_prompt column - await queryRunner.addColumn( - 'apps', - new TableColumn({ - name: 'app_generated_from_prompt', - type: 'boolean', - default: false, - isNullable: false, - }) - ); - - // Add ai_generation_metadata column - await queryRunner.addColumn( - 'apps', - new TableColumn({ - name: 'ai_generation_metadata', - type: 'jsonb', - isNullable: true, - }) - ); - - // Create app_builder_mode enum type - await queryRunner.query(`CREATE TYPE "app_builder_mode" AS ENUM ('ai', 'visual')`); - - // Add app_builder_mode column - await queryRunner.addColumn( - 'apps', - new TableColumn({ - name: 'app_builder_mode', - type: 'app_builder_mode', - default: "'visual'", - isNullable: false, - }) - ); - } - - public async down(queryRunner: QueryRunner): Promise { - // Remove columns in reverse order - await queryRunner.dropColumn('apps', 'app_builder_mode'); - await queryRunner.query('DROP TYPE "app_builder_mode"'); - await queryRunner.dropColumn('apps', 'ai_generation_metadata'); - await queryRunner.dropColumn('apps', 'app_generated_from_prompt'); - await queryRunner.dropColumn('apps', 'is_initialised_from_prompt'); - } - -} diff --git a/server/data-migrations/1750927083207-AddArtifactsTable.ts b/server/data-migrations/1750927083207-AddArtifactsTable.ts deleted file mode 100644 index 078c3412aa..0000000000 --- a/server/data-migrations/1750927083207-AddArtifactsTable.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { MigrationInterface, QueryRunner, Table, TableForeignKey } from "typeorm"; - -export class AddArtifactsTable1750927083207 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.createTable( - new Table({ - name: 'artifacts', - columns: [ - { - name: 'id', - type: 'uuid', - isPrimary: true, - isGenerated: true, - generationStrategy: 'uuid', - }, - { - name: 'conversation_id', - type: 'uuid', - isNullable: false, - }, - { - name: 'message_id', - type: 'uuid', - isNullable: false, - }, - { - name: 'content', - type: 'jsonb', - isNullable: false, - }, - { - name: 'identifier', - type: 'varchar', - isNullable: false, - }, - { - name: 'created_at', - type: 'timestamp', - default: 'now()', - }, - { - name: 'updated_at', - type: 'timestamp', - default: 'now()', - }, - ], - }), - true, - ); - - await queryRunner.createForeignKey( - 'artifacts', - new TableForeignKey({ - columnNames: ['conversation_id'], - referencedColumnNames: ['id'], - referencedTableName: 'ai_conversations', - onDelete: 'CASCADE', - }), - ); - - await queryRunner.createForeignKey( - 'artifacts', - new TableForeignKey({ - columnNames: ['message_id'], - referencedColumnNames: ['id'], - referencedTableName: 'ai_conversation_messages', - onDelete: 'CASCADE', - }), - ); - } - - public async down(queryRunner: QueryRunner): Promise { - const table = await queryRunner.getTable('artifacts'); - if (table) { - const foreignKeys = table.foreignKeys; - await Promise.all(foreignKeys.map(foreignKey => queryRunner.dropForeignKey('artifacts', foreignKey))); - } - await queryRunner.dropTable('artifacts'); - } -} From d38eb7a6f220878459215aa96dc03443bdcb4b85 Mon Sep 17 00:00:00 2001 From: Adish M Date: Thu, 10 Jul 2025 14:52:32 +0530 Subject: [PATCH 3/6] added the correct files for migration --- ...1748331051836-AddAiGenerationFlagsInApp.ts | 60 ++++++++++++++ .../1748542504137-AddArtifactsTable.ts | 80 +++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 server/data-migrations/1748331051836-AddAiGenerationFlagsInApp.ts create mode 100644 server/data-migrations/1748542504137-AddArtifactsTable.ts diff --git a/server/data-migrations/1748331051836-AddAiGenerationFlagsInApp.ts b/server/data-migrations/1748331051836-AddAiGenerationFlagsInApp.ts new file mode 100644 index 0000000000..2f55d6fbbe --- /dev/null +++ b/server/data-migrations/1748331051836-AddAiGenerationFlagsInApp.ts @@ -0,0 +1,60 @@ +import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm'; + +export class AddAiGenerationFlagsInApp1748331051836 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + // Add is_initialised_from_prompt column + await queryRunner.addColumn( + 'apps', + new TableColumn({ + name: 'is_initialised_from_prompt', + type: 'boolean', + default: false, + isNullable: false, + }) + ); + + // Add app_generated_from_prompt column + await queryRunner.addColumn( + 'apps', + new TableColumn({ + name: 'app_generated_from_prompt', + type: 'boolean', + default: false, + isNullable: false, + }) + ); + + // Add ai_generation_metadata column + await queryRunner.addColumn( + 'apps', + new TableColumn({ + name: 'ai_generation_metadata', + type: 'jsonb', + isNullable: true, + }) + ); + + // Create app_builder_mode enum type + await queryRunner.query(`CREATE TYPE "app_builder_mode" AS ENUM ('ai', 'visual')`); + + // Add app_builder_mode column + await queryRunner.addColumn( + 'apps', + new TableColumn({ + name: 'app_builder_mode', + type: 'app_builder_mode', + default: "'visual'", + isNullable: false, + }) + ); + } + + public async down(queryRunner: QueryRunner): Promise { + // Remove columns in reverse order + await queryRunner.dropColumn('apps', 'app_builder_mode'); + await queryRunner.query('DROP TYPE "app_builder_mode"'); + await queryRunner.dropColumn('apps', 'ai_generation_metadata'); + await queryRunner.dropColumn('apps', 'app_generated_from_prompt'); + await queryRunner.dropColumn('apps', 'is_initialised_from_prompt'); + } +} diff --git a/server/data-migrations/1748542504137-AddArtifactsTable.ts b/server/data-migrations/1748542504137-AddArtifactsTable.ts new file mode 100644 index 0000000000..2c66977be8 --- /dev/null +++ b/server/data-migrations/1748542504137-AddArtifactsTable.ts @@ -0,0 +1,80 @@ +import { MigrationInterface, QueryRunner, Table, TableForeignKey } from 'typeorm'; + +export class AddArtifactsTable1748542504137 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.createTable( + new Table({ + name: 'artifacts', + columns: [ + { + name: 'id', + type: 'uuid', + isPrimary: true, + isGenerated: true, + generationStrategy: 'uuid', + }, + { + name: 'conversation_id', + type: 'uuid', + isNullable: false, + }, + { + name: 'message_id', + type: 'uuid', + isNullable: false, + }, + { + name: 'content', + type: 'jsonb', + isNullable: false, + }, + { + name: 'identifier', + type: 'varchar', + isNullable: false, + }, + { + name: 'created_at', + type: 'timestamp', + default: 'now()', + }, + { + name: 'updated_at', + type: 'timestamp', + default: 'now()', + }, + ], + }), + true, + ); + + await queryRunner.createForeignKey( + 'artifacts', + new TableForeignKey({ + columnNames: ['conversation_id'], + referencedColumnNames: ['id'], + referencedTableName: 'ai_conversations', + onDelete: 'CASCADE', + }), + ); + + await queryRunner.createForeignKey( + 'artifacts', + new TableForeignKey({ + columnNames: ['message_id'], + referencedColumnNames: ['id'], + referencedTableName: 'ai_conversation_messages', + onDelete: 'CASCADE', + }), + ); + } + + public async down(queryRunner: QueryRunner): Promise { + const table = await queryRunner.getTable('artifacts'); + if (table) { + const foreignKeys = table.foreignKeys; + await Promise.all(foreignKeys.map(foreignKey => queryRunner.dropForeignKey('artifacts', foreignKey))); + } + await queryRunner.dropTable('artifacts'); + } +} From a290517f95be5835705358042d61d6c39c4a849c Mon Sep 17 00:00:00 2001 From: Muhsin Shah C P Date: Thu, 10 Jul 2025 15:05:39 +0530 Subject: [PATCH 4/6] update subproject reference to latest commit --- server/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/ee b/server/ee index 8cb87023e8..79cef2a69c 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 8cb87023e84d7b72d710338649de9005b74b52ba +Subproject commit 79cef2a69cc2f525955ed17609ecba968851ff87 From b5aec9a2db28c7d0d81412828d2601921d00f82f Mon Sep 17 00:00:00 2001 From: Adish M <44204658+adishM98@users.noreply.github.com> Date: Thu, 10 Jul 2025 16:22:55 +0530 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=9A=80=20chore:=20update=20submodules?= =?UTF-8?q?=20to=20latest=20main=20after=20auto-merge=20(#13317)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/ee b/server/ee index 79cef2a69c..80886c9d5e 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 79cef2a69cc2f525955ed17609ecba968851ff87 +Subproject commit 80886c9d5e30e738e9b7bb2e9acd42d20fcbf810 From a2864ae2b3fedfec4d3a268e0fdc74d7af70bf52 Mon Sep 17 00:00:00 2001 From: Adish M <44204658+adishM98@users.noreply.github.com> Date: Thu, 10 Jul 2025 16:28:39 +0530 Subject: [PATCH 6/6] Fix the tag name in the release workflow (#13316) --- .github/workflows/docker-release.yml | 14 +++++++------- .github/workflows/packer-build.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 7afca64ea7..6702780e88 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -21,7 +21,7 @@ jobs: if: "contains(github.event.release.tag_name, '-ce-lts')" uses: actions/checkout@v2 with: - ref: refs/heads/lts-3.6 + ref: refs/heads/lts-3.16 # Create Docker Buildx builder with platform configuration - name: Set up Docker Buildx @@ -108,7 +108,7 @@ jobs: if: "contains(github.event.release.tag_name, '-ee-lts')" uses: actions/checkout@v2 with: - ref: refs/heads/lts-3.6 + ref: refs/heads/lts-3.16 # Create Docker Buildx builder with platform configuration - name: Set up Docker Buildx @@ -155,7 +155,7 @@ jobs: context: . build-args: | CUSTOM_GITHUB_TOKEN=${{ secrets.CUSTOM_GITHUB_TOKEN }} - BRANCH_NAME=lts-3.6 + BRANCH_NAME=lts-3.16 file: docker/ee/ee-production.Dockerfile push: true tags: tooljet/tooljet-ee:${{ github.event.release.tag_name }},tooljet/tooljet-ee:ee-lts-latest,tooljet/tooljet:ee-lts-latest,tooljet/tooljet:${{ github.event.release.tag_name }} @@ -185,7 +185,7 @@ jobs: if: "contains(github.event.release.tag_name, '-cloud-lts')" uses: actions/checkout@v2 with: - ref: refs/heads/lts-3.6 + ref: refs/heads/lts-3.16 # Create Docker Buildx builder with platform configuration - name: Set up Docker Buildx @@ -215,7 +215,7 @@ jobs: context: . build-args: | CUSTOM_GITHUB_TOKEN=${{ secrets.CUSTOM_GITHUB_TOKEN }} - BRANCH_NAME=lts-3.6 + BRANCH_NAME=lts-3.16 file: docker/cloud/cloud-server.Dockerfile push: true tags: tooljet/saas:${{ github.event.release.tag_name }} @@ -247,11 +247,11 @@ jobs: with: ref: refs/heads/main - - name: Checkout code to lts-3.0 + - name: Checkout code to lts-3.16 if: contains(github.event.release.tag_name, '-ee-lts') uses: actions/checkout@v2 with: - ref: refs/heads/lts-3.0 + ref: refs/heads/lts-3.16 # Create Docker Buildx builder with platform configuration - name: Set up Docker Buildx diff --git a/.github/workflows/packer-build.yml b/.github/workflows/packer-build.yml index 7c1dfbb583..2397df3c52 100644 --- a/.github/workflows/packer-build.yml +++ b/.github/workflows/packer-build.yml @@ -16,11 +16,11 @@ jobs: name: packer-ee steps: - - name: Checkout code to lts-3.6 branch + - name: Checkout code to lts-3.16 branch if: contains(github.event.release.tag_name, '-ee-lts') uses: actions/checkout@v2 with: - ref: refs/heads/lts-3.6 + ref: refs/heads/lts-3.16 - name: Setting tag if: "${{ github.event.inputs.version != '' }}"