Compare commits

..

1 Commits

Author SHA1 Message Date
Will Jones
a8f139ad23 fixes for action 2023-05-23 20:12:41 -07:00
2 changed files with 19 additions and 13 deletions

View File

@@ -38,8 +38,7 @@ jobs:
- uses: softprops/action-gh-release@v1 - uses: softprops/action-gh-release@v1
with: with:
draft: true draft: true
files: | files: target/vectordb-*.crate
rust/target/vectordb-*.crate
python: python:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -58,7 +57,9 @@ jobs:
with: with:
python-version: "3.10" python-version: "3.10"
- name: Build wheel - 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 - uses: softprops/action-gh-release@v1
with: with:
draft: true draft: true
@@ -81,7 +82,6 @@ jobs:
node-version: 20 node-version: 20
cache: 'npm' cache: 'npm'
cache-dependency-path: node/package-lock.json cache-dependency-path: node/package-lock.json
- uses: Swatinem/rust-cache@v2
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt update sudo apt update
@@ -100,6 +100,7 @@ jobs:
runs-on: macos-12 runs-on: macos-12
needs: draft-release needs: draft-release
strategy: strategy:
fail-fast: false
matrix: matrix:
target: [x86_64-apple-darwin, aarch64-apple-darwin] target: [x86_64-apple-darwin, aarch64-apple-darwin]
steps: steps:
@@ -108,7 +109,9 @@ jobs:
- name: Install system dependencies - name: Install system dependencies
run: brew install protobuf run: brew install protobuf
- name: Install npm dependencies - name: Install npm dependencies
run: npm ci run: |
cd node
npm ci
- name: Build MacOS native node modules - name: Build MacOS native node modules
run: bash ci/build_macos_artifacts.sh ${{ matrix.target }} run: bash ci/build_macos_artifacts.sh ${{ matrix.target }}
- uses: softprops/action-gh-release@v1 - uses: softprops/action-gh-release@v1
@@ -120,22 +123,29 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: draft-release needs: draft-release
strategy: strategy:
fail-fast: false
matrix: matrix:
target: target:
- x86_64-unknown-linux-gnu:centos - x86_64-unknown-linux-gnu
- aarch64-unknown-linux-gnu:centos - aarch64-unknown-linux-gnu
- aarch64-unknown-linux-musl - aarch64-unknown-linux-musl
- x86_64-unknown-linux-musl - x86_64-unknown-linux-musl
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Setup Rust
uses: ATiltedTree/setup-rust@v1
with:
rust-version: stable
- name: Install system dependencies - name: Install system dependencies
run: | run: |
sudo apt update sudo apt update
sudo apt install -y protobuf-compiler libssl-dev sudo apt install -y protobuf-compiler libssl-dev
cargo install cross cargo install cross
- name: Install npm dependencies - name: Install npm dependencies
run: npm ci run: |
cd node
npm ci
- name: Build Linux native node modules - name: Build Linux native node modules
run: bash ci/build_linux_artifacts.sh ${{ matrix.target }} run: bash ci/build_linux_artifacts.sh ${{ matrix.target }}
- uses: softprops/action-gh-release@v1 - uses: softprops/action-gh-release@v1

View File

@@ -20,11 +20,7 @@ build_node_binaries() {
do do
echo "Building node library for $target" echo "Building node library for $target"
# cross doesn't yet pass this down to Docker, so we do it ourselves. # 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"
export CROSS_CONTAINER_OPTS="--platform linux/amd64"
else
export CROSS_CONTAINER_OPTS="--platform linux/arm64/v8"
fi
npm run cross-release -- --target $target npm run cross-release -- --target $target
npm run pack-build -- --target $target npm run pack-build -- --target $target
done done