diff --git a/.github/workflows/make-release-commit.yml b/.github/workflows/make-release-commit.yml index 1f66a566..12a628ea 100644 --- a/.github/workflows/make-release-commit.yml +++ b/.github/workflows/make-release-commit.yml @@ -84,6 +84,7 @@ jobs: run: | pip install bump-my-version PyGithub packaging bash ci/bump_version.sh ${{ inputs.type }} ${{ inputs.bump-minor }} v $COMMIT_BEFORE_BUMP + bash ci/update_lockfiles.sh - name: Push new version tag if: ${{ !inputs.dry_run }} uses: ad-m/github-push-action@master diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 64067d7a..544e85e1 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -116,7 +116,7 @@ jobs: set -e npm ci npm run docs - if ! git diff --exit-code; then + if ! git diff --exit-code -- . ':(exclude)Cargo.lock'; then echo "Docs need to be updated" echo "Run 'npm run docs', fix any warnings, and commit the changes." exit 1 diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index f498e348..8ef96f2e 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -546,21 +546,3 @@ jobs: notification_title: "{workflow} is failing" env: SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }} - - update-package-lock: - if: startsWith(github.ref, 'refs/tags/v') - needs: [release] - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: main - token: ${{ secrets.LANCEDB_RELEASE_TOKEN }} - fetch-depth: 0 - lfs: true - - uses: ./.github/workflows/update_package_lock - with: - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index 0838c6ec..6008d6d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4123,7 +4123,7 @@ dependencies = [ [[package]] name = "lancedb" -version = "0.19.2-beta.0" +version = "0.20.0-beta.0" dependencies = [ "arrow", "arrow-array", @@ -4210,7 +4210,7 @@ dependencies = [ [[package]] name = "lancedb-node" -version = "0.19.2-beta.0" +version = "0.20.0-beta.0" dependencies = [ "arrow-array", "arrow-ipc", @@ -4235,7 +4235,7 @@ dependencies = [ [[package]] name = "lancedb-nodejs" -version = "0.19.2-beta.0" +version = "0.20.0-beta.0" dependencies = [ "arrow-array", "arrow-ipc", @@ -4255,7 +4255,7 @@ dependencies = [ [[package]] name = "lancedb-python" -version = "0.22.2-beta.0" +version = "0.23.0-beta.0" dependencies = [ "arrow", "env_logger", diff --git a/ci/update_lockfiles.sh b/ci/update_lockfiles.sh new file mode 100755 index 00000000..e6c51bf1 --- /dev/null +++ b/ci/update_lockfiles.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -euo pipefail + +# This updates the lockfile without building +cargo metadata > /dev/null + +pushd nodejs || exit 1 +npm install --package-lock-only +popd +pushd node || exit 1 +npm install --package-lock-only +popd + +if git diff --quiet --exit-code; then + echo "No lockfile changes to commit; skipping amend." +else + git commit --amend --no-edit +fi