Skip to content

Commit

Permalink
swap to gzip since that is more supported than zip
Browse files Browse the repository at this point in the history
  • Loading branch information
tantaman committed Nov 29, 2023
1 parent b7c5710 commit 50c4115
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 21 deletions.
43 changes: 24 additions & 19 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
include:
- os: ubuntu-latest
library_name: crsqlite.so
artifact_name: crsqlite.zip
asset_name: crsqlite-linux-x86_64.zip
artifact_name: crsqlite.gz
asset_name: crsqlite-linux-x86_64.gz
- os: macos-latest
library_name: crsqlite.dylib
artifact_name: crsqlite.zip
asset_name: crsqlite-darwin-x86_64.zip
artifact_name: crsqlite.gz
asset_name: crsqlite-darwin-x86_64.gz

steps:
- uses: actions/checkout@v3
Expand All @@ -37,7 +37,8 @@ jobs:
run: |
cd core
make loadable
zip dist/crsqlite.zip dist/${{ matrix.library_name }}
gzip dist/${{ matrix.library_name }}
mv dist/${{ matrix.library_name }}.gz dist/crsqlite.gz
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
Expand All @@ -56,8 +57,8 @@ jobs:
include:
- os: macos-latest
library_name: crsqlite.dylib
artifact_name: crsqlite.zip
asset_name: crsqlite-darwin-aarch64.zip
artifact_name: crsqlite.gz
asset_name: crsqlite-darwin-aarch64.gz

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -104,8 +105,8 @@ jobs:
include:
- os: ubuntu-latest
library_name: crsqlite.so
artifact_name: crsqlite.zip
asset_name: crsqlite-linux-aarch64.zip
artifact_name: crsqlite.gz
asset_name: crsqlite-linux-aarch64.gz

steps:
- name: Install toolchain
Expand All @@ -126,7 +127,8 @@ jobs:
run: |
cd core
export CI_MAYBE_TARGET="aarch64-unknown-linux-gnu" && export CI_GCC="aarch64-linux-gnu-gcc" && make loadable
zip dist/crsqlite.zip dist/${{ matrix.library_name }}
gzip dist/${{ matrix.library_name }}
mv dist/${{ matrix.library_name }}.gz dist/crsqlite.gz
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
Expand All @@ -144,8 +146,8 @@ jobs:
include:
- os: ubuntu-latest
library_name: crsqlite.dll
artifact_name: crsqlite.zip
asset_name: crsqlite-win-x86_64.zip
artifact_name: crsqlite.gz
asset_name: crsqlite-win-x86_64.gz

steps:
- uses: actions/checkout@v3
Expand All @@ -166,7 +168,8 @@ jobs:
run: |
cd core
export CI_MAYBE_TARGET="x86_64-pc-windows-gnu" && export CI_GCC="x86_64-w64-mingw32-gcc" && make loadable
zip dist/crsqlite.zip dist/${{ matrix.library_name }}
gzip dist/${{ matrix.library_name }}
mv dist/${{ matrix.library_name }}.gz dist/crsqlite.gz
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
Expand All @@ -184,8 +187,8 @@ jobs:
include:
- os: ubuntu-latest
library_name: crsqlite.dll
artifact_name: crsqlite.zip
asset_name: crsqlite-win-i686.zip
artifact_name: crsqlite.gz
asset_name: crsqlite-win-i686.gz

steps:
- uses: actions/checkout@v3
Expand All @@ -206,7 +209,8 @@ jobs:
run: |
cd core
export CI_MAYBE_TARGET="i686-pc-windows-gnu" && export CI_GCC="i686-w64-mingw32-gcc" && make loadable
zip dist/crsqlite.zip dist/${{ matrix.library_name }}
gzip dist/${{ matrix.library_name }}
mv dist/${{ matrix.library_name }}.gz dist/crsqlite.gz
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
Expand All @@ -224,8 +228,8 @@ jobs:
include:
- os: ubuntu-latest
library_name: crsqlite.so
artifact_name: crsqlite.zip
asset_name: crsqlite-aarch64-linux-android.zip
artifact_name: crsqlite.gz
asset_name: crsqlite-aarch64-linux-android.gz

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -254,7 +258,8 @@ jobs:
run: |
cd core
export ANDROID_TARGET=aarch64-linux-android; make loadable
zip dist/crsqlite.zip dist/${{ matrix.library_name }}
gzip dist/${{ matrix.library_name }}
mv dist/${{ matrix.library_name }}.gz dist/crsqlite.gz
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
Expand Down
6 changes: 4 additions & 2 deletions core/nodejs-install-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import fs from "fs";
import https from "https";
import pkg from "./package.json" assert { type: "json" };
import { exec } from "child_process";
import zlip from "zlib";
const unzip = zlip.createUnzip();
let { version } = pkg;

let arch = process.arch;
Expand Down Expand Up @@ -50,7 +52,7 @@ if (process.env.CRSQLITE_NOPREBUILD) {
break;
}

const binaryUrl = `https://github.com/vlcn-io/cr-sqlite/releases/download/${version}/crsqlite-${os}-${arch}.${ext}`;
const binaryUrl = `https://github.com/vlcn-io/cr-sqlite/releases/download/${version}/crsqlite-${os}-${arch}.zip`;
console.log(`Look for prebuilt binary from ${binaryUrl}`);
const distPath = join("dist", `crsqlite.${ext}`);

Expand Down Expand Up @@ -89,7 +91,7 @@ if (process.env.CRSQLITE_NOPREBUILD) {
}

const file = fs.createWriteStream(distPath);
res.pipe(file);
res.pipe(unzip).pipe(file);
file.on("finish", () => {
file.close();
console.log("Prebuilt binary downloaded");
Expand Down

0 comments on commit 50c4115

Please sign in to comment.