From a12875fde3f1989573a43164664d5577c03a0966 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Tue, 4 Feb 2025 16:48:02 +0100 Subject: [PATCH 1/5] dbgate-pro repo ref --- .github/workflows/build-app-pro-beta.yaml | 1 + .github/workflows/build-app-pro.yaml | 1 + .github/workflows/build-docker-pro.yaml | 1 + .github/workflows/build-npm-pro.yaml | 1 + workflow-templates/includes.tpl.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml index 5285c9be9..4bfa3497a 100644 --- a/.github/workflows/build-app-pro-beta.yaml +++ b/.github/workflows/build-app-pro-beta.yaml @@ -39,6 +39,7 @@ jobs: repository: dbgate/dbgate-pro token: '${{ secrets.GH_TOKEN }}' path: dbgate-pro + ref: ef8978facad7372157c7a5e367763ecc7a07a14a - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml index 7529f45b0..e56ab96f6 100644 --- a/.github/workflows/build-app-pro.yaml +++ b/.github/workflows/build-app-pro.yaml @@ -39,6 +39,7 @@ jobs: repository: dbgate/dbgate-pro token: '${{ secrets.GH_TOKEN }}' path: dbgate-pro + ref: ef8978facad7372157c7a5e367763ecc7a07a14a - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/build-docker-pro.yaml b/.github/workflows/build-docker-pro.yaml index a11f32f4e..5812d866e 100644 --- a/.github/workflows/build-docker-pro.yaml +++ b/.github/workflows/build-docker-pro.yaml @@ -44,6 +44,7 @@ jobs: repository: dbgate/dbgate-pro token: '${{ secrets.GH_TOKEN }}' path: dbgate-pro + ref: ef8978facad7372157c7a5e367763ecc7a07a14a - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/build-npm-pro.yaml b/.github/workflows/build-npm-pro.yaml index 53b982a59..607d9fe20 100644 --- a/.github/workflows/build-npm-pro.yaml +++ b/.github/workflows/build-npm-pro.yaml @@ -32,6 +32,7 @@ jobs: repository: dbgate/dbgate-pro token: '${{ secrets.GH_TOKEN }}' path: dbgate-pro + ref: ef8978facad7372157c7a5e367763ecc7a07a14a - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/workflow-templates/includes.tpl.yaml b/workflow-templates/includes.tpl.yaml index 82be38b1f..4e430dd78 100644 --- a/workflow-templates/includes.tpl.yaml +++ b/workflow-templates/includes.tpl.yaml @@ -7,6 +7,7 @@ checkout-and-merge-pro: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro + ref: ef8978facad7372157c7a5e367763ecc7a07a14a - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro From e361cb0113d42f96f10005df93a730d7e69da999 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Tue, 4 Feb 2025 16:48:17 +0100 Subject: [PATCH 2/5] v6.1.6-premuim-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aaed4468f..79341be6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "6.1.5", + "version": "6.1.6-premuim-beta.1", "name": "dbgate-all", "workspaces": [ "packages/*", From fe2e5bc82e861c9bf76cc9e0f564c0e067431f59 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Tue, 4 Feb 2025 16:48:47 +0100 Subject: [PATCH 3/5] v6.1.6-premium-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 79341be6d..5d2608256 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "6.1.6-premuim-beta.1", + "version": "6.1.6-premium-beta.1", "name": "dbgate-all", "workspaces": [ "packages/*", From fa6388ee6b2f4306061d3bfcae0b556b59eda264 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Tue, 4 Feb 2025 17:04:26 +0100 Subject: [PATCH 4/5] v6.1.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5d2608256..90d00cd21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "6.1.6-premium-beta.1", + "version": "6.1.6", "name": "dbgate-all", "workspaces": [ "packages/*", From e76c5634710a4e7491b4368a0fb43b05672e1553 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Tue, 4 Feb 2025 17:05:20 +0100 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e1388b04..6d428a673 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ Builds: - linux - application for linux - win - application for Windows +### 6.1.6 +- FIXED: Hotfix build process for premium edition + ### 6.1.5 - FIXED: Serious security hotfix (for Docker and NPM, when using LOGIN and PASSWORD environment variables or LOGIN_PASSWORD_xxx) - no changes for desktop app and for Team premium edition, when using storage DB