removed mongodb-client-encryption from community build

.github/workflows/build-app-beta.yaml

@@ -16,6 +16,38 @@ jobs:
         # os: [macOS-10.15]
 
     steps:
+      - name: "Install python 3.11 (Linux, Windows)"
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+        if: matrix.os.setup_python
+
+      - name: Install python 3.11 (MacOS)
+        if: matrix.os.type == 'macos'
+        id: mac_python
+        env:
+          ARCH: ${{ matrix.os.arch }}
+        run: |
+          rm -f /usr/local/bin/2to3-3.11
+          rm -f /usr/local/bin/idle3.11
+          rm -f /usr/local/bin/pydoc3.11
+          rm -f /usr/local/bin/python3.11
+          rm -f /usr/local/bin/python3.11-config
+          brew install python@3.11
+          if [ "$ARCH" = "arm64" ]; then
+              # Add Python 3.11 to PATH for arm64
+              echo "/opt/homebrew/opt/python@3.11/libexec/bin" >> $GITHUB_PATH
+              export PATH="/opt/homebrew/opt/python@3.11/libexec/bin:$PATH"
+              export PYTHON_PATH="/opt/homebrew/opt/python@3.11/libexec/bin/python3"
+              echo "python_path=$PYTHON_PATH" >> $GITHUB_OUTPUT
+          else
+              # Add Python 3.11 to PATH for other architectures
+              echo "/usr/local/opt/python@3.11/libexec/bin" >> $GITHUB_PATH
+              export PATH="/usr/local/opt/python@3.11/libexec/bin:$PATH"
+              export PYTHON_PATH="/usr/local/opt/python@3.11/libexec/bin/python3"
+              echo "python_path=$PYTHON_PATH" >> $GITHUB_OUTPUT
+          fi
+
       - name: Context
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
@@ -27,9 +59,9 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 22.x
-      - name: yarn adjustPackageJson
+      - name: adjustPackageJson
         run: |
-          yarn adjustPackageJson
+          node adjustPackageJson --premium
       - name: setUpdaterChannel beta
         run: |
           node setUpdaterChannel beta

.github/workflows/build-app-pro-beta.yaml

@@ -50,16 +50,11 @@ jobs:
           node sync.js --nowatch
           cd ..
 
-      - name: yarn adjustPackageJson
+      - name: adjustPackageJson
         run: |
           cd ..
           cd dbgate-merged
-          yarn adjustPackageJson
+          node adjustPackageJson --premium
-      - name: adjustAppPackageJsonPremium
-        run: |
-          cd ..
-          cd dbgate-merged
-          node adjustAppPackageJsonPremium
       - name: setUpdaterChannel premium-beta
         run: |
           cd ..

.github/workflows/build-app-pro.yaml

@@ -51,16 +51,11 @@ jobs:
           node sync.js --nowatch
           cd ..
 
-      - name: yarn adjustPackageJson
+      - name: adjustPackageJson
         run: |
           cd ..
           cd dbgate-merged
-          yarn adjustPackageJson
+          node adjustPackageJson --premium
-      - name: adjustAppPackageJsonPremium
-        run: |
-          cd ..
-          cd dbgate-merged
-          node adjustAppPackageJsonPremium
       - name: setUpdaterChannel premium
         run: |
           cd ..

.github/workflows/build-app.yaml

@@ -31,9 +31,9 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 22.x
-      - name: yarn adjustPackageJson
+      - name: adjustPackageJson
         run: |
-          yarn adjustPackageJson
+          node adjustPackageJson --community
       - name: yarn set timeout
         run: |
           yarn config set network-timeout 100000

.github/workflows/build-aws-pro-beta.yaml

@@ -54,11 +54,11 @@ jobs:
           node sync.js --nowatch
           cd ..
 
-      - name: yarn adjustPackageJson
+      - name: adjustPackageJson
         run: |
           cd ..
           cd dbgate-merged
-          yarn adjustPackageJson
+          node adjustPackageJson --premium
 
       - name: yarn install
         run: |

.github/workflows/build-docker-pro.yaml

@@ -62,11 +62,11 @@ jobs:
           node sync.js --nowatch
           cd ..
 
-      - name: yarn adjustPackageJson
+      - name: adjustPackageJson
         run: |
           cd ..
           cd dbgate-merged
-          yarn adjustPackageJson
+          node adjustPackageJson --premium
 
       - name: yarn install
         run: |

.github/workflows/build-docker.yaml

@@ -57,9 +57,9 @@ jobs:
         with:
           node-version: 18.x
 
-      - name: yarn adjustPackageJson
+      - name: adjustPackageJson
         run: |
-          yarn adjustPackageJson
+          node adjustPackageJson --community
 
       - name: yarn install
         run: |

adjustPackageJson.js

@@ -41,6 +41,29 @@ function adjustFile(file, isApp = false) {
     delete json.optionalDependencies.msnodesqlv8;
   }
 
+  if (process.argv.includes('--community')) {
+    delete json.optionalDependencies['mongodb-client-encryption'];
+  }
+
+  if (isApp && process.argv.includes('--premium')) {
+    json.build.win.target = [
+      {
+        target: 'nsis',
+        arch: ['x64'],
+      },
+    ];
+    json.build.linux.target = [
+      {
+        target: 'AppImage',
+        arch: ['x64'],
+      },
+    ];
+    json.name = 'dbgate-premium';
+    json.build.artifactName = 'dbgate-premium-${version}-${os}_${arch}.${ext}';
+    json.build.appId = 'org.dbgate.premium';
+    json.build.productName = 'DbGate Premium';
+  }
+
   fs.writeFileSync(file, JSON.stringify(json, null, 2), 'utf-8');
 }
 

package.json

@@ -47,7 +47,6 @@
     "setCurrentVersion": "node setCurrentVersion",
     "printSecrets": "node printSecrets",
     "generatePadFile": "node generatePadFile",
-    "adjustPackageJson": "node adjustPackageJson",
     "fillPackagedPlugins": "node fillPackagedPlugins",
     "resetPackagedPlugins": "node resetPackagedPlugins",
     "prettier": "prettier --write packages/api/src && prettier --write packages/datalib/src && prettier --write packages/filterparser/src && prettier --write packages/sqltree/src && prettier --write packages/tools/src && prettier --write packages/types && prettier --write packages/web/src && prettier --write app/src",