From e28488122f7505b996eaf31e025639bdf4df571e Mon Sep 17 00:00:00 2001 From: Will Jones Date: Tue, 23 May 2023 18:59:45 -0700 Subject: [PATCH] fixes for action --- .github/workflows/release.yml | 30 ++++++++++++++++++++++++------ ci/build_linux_artifacts.sh | 6 +----- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0f85628..494d92bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,8 +37,8 @@ jobs: run: cargo package --all-features - uses: softprops/action-gh-release@v1 with: - files: | - rust/target/vectordb-*.crate + draft: true + files: target/vectordb-*.crate python: runs-on: ubuntu-latest @@ -55,11 +55,14 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: "3.10" - name: Build wheel - run: python setup.py sdist bdist_wheel + run: | + pip install wheel + python setup.py sdist bdist_wheel - uses: softprops/action-gh-release@v1 with: + draft: true files: | python/dist/lancedb-*.tar.gz python/dist/lancedb-*.whl @@ -79,7 +82,6 @@ jobs: node-version: 20 cache: 'npm' cache-dependency-path: node/package-lock.json - - uses: Swatinem/rust-cache@v2 - name: Install dependencies run: | sudo apt update @@ -91,12 +93,14 @@ jobs: npm pack - uses: softprops/action-gh-release@v1 with: + draft: true files: node/vectordb-*.tgz node-macos: runs-on: macos-12 needs: draft-release strategy: + fail-fast: false matrix: target: [x86_64-apple-darwin, aarch64-apple-darwin] steps: @@ -104,16 +108,22 @@ jobs: uses: actions/checkout@v2 - name: Install system dependencies run: brew install protobuf + - name: Install npm dependencies + run: | + cd node + npm ci - name: Build MacOS native node modules run: bash ci/build_macos_artifacts.sh ${{ matrix.target }} - uses: softprops/action-gh-release@v1 with: + draft: true files: node/dist/vectordb-darwin*.tgz node-linux: runs-on: ubuntu-latest needs: draft-release strategy: + fail-fast: false matrix: target: - x86_64-unknown-linux-gnu:centos @@ -121,18 +131,26 @@ jobs: - aarch64-unknown-linux-musl - x86_64-unknown-linux-musl steps: + - name: Checkout + uses: actions/checkout@v2 - name: Install system dependencies run: | sudo apt update sudo apt install -y protobuf-compiler libssl-dev + cargo install cross + - name: Install npm dependencies + run: | + cd node + npm ci - name: Build Linux native node modules run: bash ci/build_linux_artifacts.sh ${{ matrix.target }} - uses: softprops/action-gh-release@v1 with: + draft: true files: node/dist/vectordb-linux*.tgz release: - needs: [python, node, node-macos, node-linux] + needs: [python, node, node-macos, node-linux, rust] runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 diff --git a/ci/build_linux_artifacts.sh b/ci/build_linux_artifacts.sh index 200f73ea..57add703 100644 --- a/ci/build_linux_artifacts.sh +++ b/ci/build_linux_artifacts.sh @@ -20,11 +20,7 @@ build_node_binaries() { do echo "Building node library for $target" # cross doesn't yet pass this down to Docker, so we do it ourselves. - if [[ $target == x86_64* ]]; then - export CROSS_CONTAINER_OPTS="--platform linux/amd64" - else - export CROSS_CONTAINER_OPTS="--platform linux/arm64/v8" - fi + export CROSS_CONTAINER_OPTS="--platform linux/amd64" npm run cross-release -- --target $target npm run pack-build -- --target $target done