Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions .github/workflows/general.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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]
Expand All @@ -147,20 +143,16 @@ jobs:
run: pnpm ci:install
- name: Build Packages
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: Test Packages
run: pnpm win:test
- 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
Expand Down Expand Up @@ -233,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:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions site/public/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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

Expand Down
Loading