From 1fb9016ba30bf065ea6a6bef47425e5434eb229d Mon Sep 17 00:00:00 2001 From: roll Date: Wed, 24 Sep 2025 11:47:21 +0100 Subject: [PATCH 1/4] Enable windows tests --- .github/workflows/general.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml index 366040f5..fc8093fb 100644 --- a/.github/workflows/general.yaml +++ b/.github/workflows/general.yaml @@ -147,8 +147,8 @@ jobs: run: pnpm ci:install - name: Build Packages run: pnpm build - # - name: Test Packages - # run: pnpm win:test + - name: Test Packages + run: pnpm win:test # - name: Download Binaries # uses: actions/download-artifact@v5 # with: From 1dc516deeb1634684a152e8eb96b683535865043 Mon Sep 17 00:00:00 2001 From: roll Date: Wed, 24 Sep 2025 11:59:15 +0100 Subject: [PATCH 2/4] Fixed build command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6dab4597..ca121200 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "pnpm": "^10.0.0" }, "scripts": { - "build": "pnpm -F '!docs' -F '!site' build", + "build": "pnpm -F !docs -F !site build", "bump": "ncu -ws -u", "ci:install": "pnpm install --ignore-scripts", "ci:publish": "pnpm -r publish --access public --ignore-scripts --no-git-checks", From d96b6fc1a16822c5f679181e8beee161bf40d0a5 Mon Sep 17 00:00:00 2001 From: roll Date: Wed, 24 Sep 2025 12:05:34 +0100 Subject: [PATCH 3/4] Enable windows binary test --- .github/workflows/general.yaml | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml index fc8093fb..b7d9d5d6 100644 --- a/.github/workflows/general.yaml +++ b/.github/workflows/general.yaml @@ -72,9 +72,7 @@ jobs: name: binaries path: dpkit/compile/build - name: Test Binaries - run: | - unzip -j dpkit/compile/build/*linux-x64.zip "dp*" - ./dp --version + run: unzip -j dpkit/compile/build/*linux-x64.zip && ./dp --version services: postgres: @@ -123,9 +121,7 @@ jobs: name: binaries path: dpkit/compile/build - name: Test Binaries - run: | - unzip -j dpkit/compile/build/*macos-arm64.zip "dp*" - ./dp --version + run: unzip -j dpkit/compile/build/*macos-arm64.zip && ./dp --version test-windows: needs: [test-compile] @@ -149,18 +145,14 @@ jobs: run: pnpm build - name: Test Packages run: pnpm win:test - # - name: Download Binaries - # uses: actions/download-artifact@v5 - # with: - # name: binaries - # path: dpkit/compile/build - # TODO: Enable Windows tests - # - name: Test Binaries - # run: | - # Expand-Archive dpkit\compile\build\*windows*.zip - # $exe = Get-ChildItem -Recurse -Name "dp.exe" | Select-Object -First 1 - # icacls ".\$exe" /grant Everyone:F - # & ".\$exe" --version + - name: Download Binaries + uses: actions/download-artifact@v5 + with: + name: binaries + path: dpkit/compile/build + - name: Test Binaries + shell: bash + run: unzip -j dpkit/compile/build/*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 From 457b74d3ec3385d16480476196b124ca58d753fa Mon Sep 17 00:00:00 2001 From: roll Date: Wed, 24 Sep 2025 12:24:24 +0100 Subject: [PATCH 4/4] Improved install script --- .github/workflows/general.yaml | 1 + site/public/install.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/general.yaml b/.github/workflows/general.yaml index b7d9d5d6..f6169c3a 100644 --- a/.github/workflows/general.yaml +++ b/.github/workflows/general.yaml @@ -225,6 +225,7 @@ jobs: - name: Publish Release uses: softprops/action-gh-release@v2 with: + draft: false files: dpkit/compile/build/*.zip tag_name: v${{ needs.release-draft.outputs.version }} env: diff --git a/site/public/install.sh b/site/public/install.sh index 85dacde9..3c8a4478 100755 --- a/site/public/install.sh +++ b/site/public/install.sh @@ -28,8 +28,8 @@ echo "Version: $version" platform='' machine=$(uname -m) -if [ "${GETEGET_PLATFORM:-x}" != "x" ]; then - platform="$GETEGET_PLATFORM" +if [ "${DPKIT_PLATFORM:-x}" != "x" ]; then + platform="$DPKIT_PLATFORM" else case "$(uname -s | tr '[:upper:]' '[:lower:]')" in "linux") @@ -80,7 +80,7 @@ fi archive="dp-$version-$platform.zip" source="https://github.com/datisthq/dpkit/releases/download/v$version/$archive" echo "Downloading: $source" -wget -qL --show-progress "https://github.com/datisthq/dpkit/releases/download/v$version/$archive" -O $archive +wget -qL --show-progress $source -O $archive || curl -fL $source -o $archive # Extract