diff --git a/.github/workflows/release-secret-cli.yml b/.github/workflows/release-secret-cli.yml index 84938b967a..7c0f7a1f24 100644 --- a/.github/workflows/release-secret-cli.yml +++ b/.github/workflows/release-secret-cli.yml @@ -88,20 +88,20 @@ jobs: npx modclean --patterns="default:*" --run # build executables - npm run build + npm run build:pkg - ls ./dist + ls ./dist-pkg # Move macOS executables for signing mkdir ./mac-dist - mv ./dist/nc-secret-arm64 ./mac-dist/ - mv ./dist/nc-secret-x64 ./mac-dist/ + mv ./dist-pkg/nc-secret-mgr-macos-arm64 ./mac-dist/ + mv ./dist-pkg/nc-secret-mgr-macos-x64 ./mac-dist/ - name: Upload executables(except mac executables) to release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.NC_GITHUB_TOKEN }} - file: dist/** + file: dist-pkg/** tag: ${{ github.event.inputs.tag || inputs.tag }} overwrite: true file_glob: true @@ -124,8 +124,8 @@ jobs: - name: Sign macOS executables run: | - /usr/bin/codesign --force -s - ./scripts/pkg-executable/mac-dist/nc-secret-arm64 -v - /usr/bin/codesign --force -s - ./scripts/pkg-executable/mac-dist/nc-secret-x64 -v + /usr/bin/codesign --force -s - ./scripts/pkg-executable/mac-dist/nc-secret-mgr-macos-arm64 -v + /usr/bin/codesign --force -s - ./scripts/pkg-executable/mac-dist/nc-secret-mgr-macos-x64 -v - uses: actions/upload-artifact@master with: diff --git a/packages/nc-secret-mgr/package.json b/packages/nc-secret-mgr/package.json index 87dcbfa73f..bfd442d8f5 100644 --- a/packages/nc-secret-mgr/package.json +++ b/packages/nc-secret-mgr/package.json @@ -8,7 +8,7 @@ "build": "webpack --config webpack.config.js", "dev": "cross-env NC_DB=\"pg://localhost:5432?u=postgres&p=password&d=meta_2024_09_07\" nodemon --watch 'src/**/*.ts' --exec 'ts-node --project tsconfig.json' src/index.ts -- a b --nc-db abc", "test": "mocha --require ts-node/register src/**/*.spec.ts", - "build:pkg": "npx pkg . --out-path dist --compress GZip", + "build:pkg": "npx pkg . --out-path dist-pkg --compress GZip", "npm:publish": "npm publish .", "lint": "eslint src/**/*.ts --fix" }, @@ -37,7 +37,7 @@ "mysql": "^2.18.1", "parse-database-url": "^0.3.0", "pg": "^8.12.0", - "sqlite3": "^5.1.7" + "sqlite3": "5.1.6" }, "devDependencies": { "@types/figlet": "^1.5.8", @@ -53,6 +53,7 @@ "eslint-plugin-functional": "^5.0.8", "eslint-plugin-import": "^2.29.1", "eslint-plugin-prettier": "^4.2.1", - "prettier": "^2.8.8" + "prettier": "^2.8.8", + "@mapbox/node-pre-gyp": "^1.0.11" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a3e5fbbaf..fbf4764cf3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -506,7 +506,7 @@ importers: version: 1.7.0 knex: specifier: ^3.1.0 - version: 3.1.0(mysql@2.18.1)(pg@8.13.0)(sqlite3@5.1.7) + version: 3.1.0(mysql@2.18.1)(pg@8.13.0)(sqlite3@5.1.6) mysql: specifier: ^2.18.1 version: 2.18.1 @@ -517,9 +517,12 @@ importers: specifier: ^8.12.0 version: 8.13.0 sqlite3: - specifier: ^5.1.7 - version: 5.1.7 + specifier: 5.1.6 + version: 5.1.6 devDependencies: + '@mapbox/node-pre-gyp': + specifier: ^1.0.11 + version: 1.0.11 '@types/figlet': specifier: ^1.5.8 version: 1.5.8 @@ -5610,7 +5613,7 @@ packages: resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} hasBin: true dependencies: - detect-libc: 2.0.2 + detect-libc: 2.0.3 https-proxy-agent: 5.0.1 make-dir: 3.1.0 node-fetch: 2.7.0 @@ -15231,6 +15234,9 @@ packages: /detect-libc@2.0.2: resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} engines: {node: '>=8'} + requiresBuild: true + dev: false + optional: true /detect-libc@2.0.3: resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} @@ -20620,7 +20626,7 @@ packages: - supports-color dev: false - /knex@3.1.0(mysql@2.18.1)(pg@8.13.0)(sqlite3@5.1.7): + /knex@3.1.0(mysql@2.18.1)(pg@8.13.0)(sqlite3@5.1.6): resolution: {integrity: sha512-GLoII6hR0c4ti243gMs5/1Rb3B+AjwMOfjYm97pu0FOQa7JH56hgBxYf5WK2525ceSbBY1cjeZ9yk99GPMB6Kw==} engines: {node: '>=16'} hasBin: true @@ -20662,7 +20668,7 @@ packages: pg-connection-string: 2.6.2 rechoir: 0.8.0 resolve-from: 5.0.0 - sqlite3: 5.1.7 + sqlite3: 5.1.6 tarn: 3.0.2 tildify: 2.0.0 transitivePeerDependencies: @@ -20686,7 +20692,7 @@ packages: /launch-editor@2.6.1: resolution: {integrity: sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==} dependencies: - picocolors: 1.0.1 + picocolors: 1.1.0 shell-quote: 1.8.1 dev: true @@ -26764,7 +26770,7 @@ packages: dependencies: '@mapbox/node-pre-gyp': 1.0.11 node-addon-api: 4.3.0 - tar: 6.1.15 + tar: 6.2.0 optionalDependencies: node-gyp: 8.4.1 transitivePeerDependencies: @@ -27392,17 +27398,6 @@ packages: yallist: 4.0.0 dev: true - /tar@6.1.15: - resolution: {integrity: sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==} - engines: {node: '>=10'} - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 5.0.0 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 - /tar@6.2.0: resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} engines: {node: '>=10'} @@ -29080,7 +29075,7 @@ packages: fs-extra: 11.2.0 open: 10.1.0 perfect-debounce: 1.0.0 - picocolors: 1.0.1 + picocolors: 1.1.0 sirv: 2.0.4 vite: 4.5.3(sass@1.71.1) transitivePeerDependencies: diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json index 49f57df7fd..e6003e9c5a 100644 --- a/scripts/pkg-executable/package.json +++ b/scripts/pkg-executable/package.json @@ -33,7 +33,7 @@ "nocodb": "0.204.9" }, "overrides": { - "sqlite3": "5.1.7" + "sqlite3": "5.1.6" }, "devDependencies": { "@mapbox/node-pre-gyp": "^1.0.11"