diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml index f6169c3a..9aaa5eed 100644 --- a/.github/workflows/general.yaml +++ b/.github/workflows/general.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: binaries - path: dpkit/compile/build/*.zip + path: dpkit/compile/binaries/*.zip test-linux: needs: [test-compile] @@ -70,9 +70,9 @@ jobs: uses: actions/download-artifact@v5 with: name: binaries - path: dpkit/compile/build + path: dpkit/compile/binaries - name: Test Binaries - run: unzip -j dpkit/compile/build/*linux-x64.zip && ./dp --version + run: unzip -j dpkit/compile/binaries/*linux-x64.zip && ./dp --version services: postgres: @@ -119,9 +119,9 @@ jobs: uses: actions/download-artifact@v5 with: name: binaries - path: dpkit/compile/build + path: dpkit/compile/binaries - name: Test Binaries - run: unzip -j dpkit/compile/build/*macos-arm64.zip && ./dp --version + run: unzip -j dpkit/compile/binaries/*macos-arm64.zip && ./dp --version test-windows: needs: [test-compile] @@ -149,10 +149,10 @@ jobs: uses: actions/download-artifact@v5 with: name: binaries - path: dpkit/compile/build + path: dpkit/compile/binaries - name: Test Binaries shell: bash - run: unzip -j dpkit/compile/build/*windows-x64.zip && ./dp.exe --version + run: unzip -j dpkit/compile/binaries/*windows-x64.zip && ./dp.exe --version # We have to split the release step because for some reason # using semantic-release before compilation inflates the binary sizes @@ -226,7 +226,7 @@ jobs: uses: softprops/action-gh-release@v2 with: draft: false - files: dpkit/compile/build/*.zip + files: dpkit/compile/binaries/*.zip tag_name: v${{ needs.release-draft.outputs.version }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 83dca33e..a9bbad26 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ dist/ .serena/ .mcp.json .env +dp diff --git a/dpkit/scripts/compile.ts b/dpkit/scripts/compile.ts index d57970a2..52afd2c1 100644 --- a/dpkit/scripts/compile.ts +++ b/dpkit/scripts/compile.ts @@ -15,11 +15,10 @@ function makeShell(...paths: string[]) { const $root = makeShell("..") const $compile = makeShell("..", "compile") -const $build = makeShell("..", "compile", "build") +const $binaries = makeShell("..", "compile", "binaries") // Cleanup -await $root`rm -rf build` await $root`rm -rf compile` await $root`mkdir compile` @@ -94,17 +93,17 @@ for (const target of targets) { await $compile` bun build main.ts --compile - --outfile build/${folder}/dp + --outfile binaries/${folder}/dp --target ${target.name} ` // For some reason bun creates it with no permissions if (target.name.startsWith("bun-windows")) { - await $build`chmod +r ${folder}/dp.exe` + await $binaries`chmod +r ${folder}/dp.exe` } - await $build`zip -r ${folder}.zip ${folder}` - await $build`rm -rf ${folder}` + await $binaries`zip -r ${folder}.zip ${folder}` + await $binaries`rm -rf ${folder}` await $compile`rm -rf node_modules/${target.polars}` //await $compile`rm -rf node_modules/${target.libsql}` diff --git a/site/public/install.sh b/site/public/install.sh index bf8d4050..d9902bca 100755 --- a/site/public/install.sh +++ b/site/public/install.sh @@ -2,7 +2,7 @@ # This script installs dpkit # -# Quick install: `curl https://dpkit.dev/install.sh | sh` +# Quick install: `curl -fsSL https://dpkit.dev/install.sh | sh` # # Acknowledgments: # - eget (https://github.com/zyedidia/eget) @@ -54,21 +54,21 @@ fi if [ "x$platform" = "x" ]; then cat << 'EOM' -/=====================================\\ -| COULD NOT DETECT PLATFORM | -\\=====================================/ -Uh oh! We couldn't automatically detect your operating system. +We couldn't automatically detect your operating system. + To continue with installation, please choose from one of the following values: - linux-x64 - linux-arm64 - macos-x64 - macos-arm64 - windows-x64 + Export your selection as the DPKIT_PLATFORM environment variable, and then re-run this script. + For example: $ export DPKIT_PLATFORM=linux-x64 - $ curl https://dpkit.dev/install.sh | sh + $ curl -fsSL https://dpkit.dev/install.sh | sh EOM exit 1 else