Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-1.7] [ci] Updated hard-coded core version in another file #2212

Merged
merged 2 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/python-so-copying.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ jobs:
if: ${{ matrix.TILEDB_EXISTS == 'yes' }}
run: |
mkdir -p external
wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.19.1/tiledb-linux-x86_64-2.19.1-29ceb3e7.tar.gz
# Please do not edit manually -- let scripts/update-tiledb-version.py update this
wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.19.2/tiledb-linux-x86_64-2.19.2-dc780d2.tar.gz
tar -C external -xzf tiledb-linux-x86_64-*.tar.gz
ls external/lib/
echo "LD_LIBRARY_PATH=$(pwd)/external/lib" >> $GITHUB_ENV
Expand Down
4 changes: 4 additions & 0 deletions scripts/update-tiledb-version.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ def main(args):
filepath = f"{os.path.dirname(__file__)}/../apis/r/tools/get_tarball.R"
update_version(filepath, new_version, new_hash, update_sha=False)

# update CI version
filepath = f"{os.path.dirname(__file__)}/../.github/workflows/python-so-copying.yml"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this file won't exist after #2211 is merged, right? I'm not following the logic of backporting this commit. If it is simply a bot that backports every commit that lands on main, I think this can be closed

Copy link
Member

@johnkerl johnkerl Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdblischak please see #2210

Yes, I do have multiple PRs in flight in multiple branches -- sequenced as my understanding has unfolded/developed throughout this afternoon

I'll resolve this bookkeeping issue -- freeing you up to work on other things -- I'll clean up from here

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me. Thanks!

update_version(filepath, new_version, new_hash)


if __name__ == "__main__":
description = (
Expand Down
Loading