diff --git a/.github/workflows/make-release-commit.yml b/.github/workflows/make-release-commit.yml index 12a628ea..21b359df 100644 --- a/.github/workflows/make-release-commit.yml +++ b/.github/workflows/make-release-commit.yml @@ -93,11 +93,3 @@ jobs: github_token: ${{ secrets.LANCEDB_RELEASE_TOKEN }} branch: ${{ github.ref }} tags: true - - uses: ./.github/workflows/update_package_lock - if: ${{ !inputs.dry_run && inputs.other }} - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - - uses: ./.github/workflows/update_package_lock_nodejs - if: ${{ !inputs.dry_run && inputs.other }} - with: - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/update_package_lock/action.yml b/.github/workflows/update_package_lock/action.yml deleted file mode 100644 index 132eaddf..00000000 --- a/.github/workflows/update_package_lock/action.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: update_package_lock -description: "Update node's package.lock" - -inputs: - github_token: - required: true - description: "github token for the repo" - -runs: - using: "composite" - steps: - - uses: actions/setup-node@v3 - with: - node-version: 20 - - name: Set git configs - shell: bash - run: | - git config user.name 'Lance Release' - git config user.email 'lance-dev@lancedb.com' - - name: Update package-lock.json file - working-directory: ./node - run: | - npm install - git add package-lock.json - git commit -m "Updating package-lock.json" - shell: bash - - name: Push changes - if: ${{ inputs.dry_run }} == "false" - uses: ad-m/github-push-action@master - with: - github_token: ${{ inputs.github_token }} - branch: main - tags: true diff --git a/.github/workflows/update_package_lock_nodejs/action.yml b/.github/workflows/update_package_lock_nodejs/action.yml deleted file mode 100644 index 33746433..00000000 --- a/.github/workflows/update_package_lock_nodejs/action.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: update_package_lock_nodejs -description: "Update nodejs's package.lock" - -inputs: - github_token: - required: true - description: "github token for the repo" - -runs: - using: "composite" - steps: - - uses: actions/setup-node@v3 - with: - node-version: 20 - - name: Set git configs - shell: bash - run: | - git config user.name 'Lance Release' - git config user.email 'lance-dev@lancedb.com' - - name: Update package-lock.json file - working-directory: ./nodejs - run: | - npm install - git add package-lock.json - git commit -m "Updating package-lock.json" - shell: bash - - name: Push changes - if: ${{ inputs.dry_run }} == "false" - uses: ad-m/github-push-action@master - with: - github_token: ${{ inputs.github_token }} - branch: main - tags: true diff --git a/ci/update_lockfiles.sh b/ci/update_lockfiles.sh index e6c51bf1..b91e0b95 100755 --- a/ci/update_lockfiles.sh +++ b/ci/update_lockfiles.sh @@ -14,5 +14,6 @@ popd if git diff --quiet --exit-code; then echo "No lockfile changes to commit; skipping amend." else + git add Cargo.lock nodejs/package-lock.json node/package-lock.json git commit --amend --no-edit fi