From 2d5e67802d4ab3c41ea81cfab8fab890ebca5056 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 25 Dec 2024 12:09:25 +0100 Subject: [PATCH] removed mongodb-client-encryption from community build --- .github/workflows/build-app-beta.yaml | 36 +++++++++++++++++++++-- .github/workflows/build-app-pro-beta.yaml | 9 ++---- .github/workflows/build-app-pro.yaml | 9 ++---- .github/workflows/build-app.yaml | 4 +-- .github/workflows/build-aws-pro-beta.yaml | 4 +-- .github/workflows/build-docker-pro.yaml | 4 +-- .github/workflows/build-docker.yaml | 4 +-- adjustPackageJson.js | 23 +++++++++++++++ package.json | 1 - 9 files changed, 69 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 944af3560..3e57a0385 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.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 diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml index f1aa8b13f..34f0a742a 100644 --- a/.github/workflows/build-app-pro-beta.yaml +++ b/.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 - - name: adjustAppPackageJsonPremium - run: | - cd .. - cd dbgate-merged - node adjustAppPackageJsonPremium + node adjustPackageJson --premium - name: setUpdaterChannel premium-beta run: | cd .. diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml index 365210f9b..e3bef388f 100644 --- a/.github/workflows/build-app-pro.yaml +++ b/.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 - - name: adjustAppPackageJsonPremium - run: | - cd .. - cd dbgate-merged - node adjustAppPackageJsonPremium + node adjustPackageJson --premium - name: setUpdaterChannel premium run: | cd .. diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index 9806d84d8..2a9a334b5 100644 --- a/.github/workflows/build-app.yaml +++ b/.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 diff --git a/.github/workflows/build-aws-pro-beta.yaml b/.github/workflows/build-aws-pro-beta.yaml index 83b866c31..1f68c1b3c 100644 --- a/.github/workflows/build-aws-pro-beta.yaml +++ b/.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: | diff --git a/.github/workflows/build-docker-pro.yaml b/.github/workflows/build-docker-pro.yaml index af6476cfe..146b20246 100644 --- a/.github/workflows/build-docker-pro.yaml +++ b/.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: | diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index e5db388a3..85737fdd6 100644 --- a/.github/workflows/build-docker.yaml +++ b/.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: | diff --git a/adjustPackageJson.js b/adjustPackageJson.js index ed1cef914..29e96821b 100644 --- a/adjustPackageJson.js +++ b/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'); } diff --git a/package.json b/package.json index f3944cd3b..ca3cb5ec2 100644 --- a/package.json +++ b/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",