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.

Sign up for GitHub

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

[REVIEW] Fix branch version in CI scripts #13029

Merged
merged 1 commit into from
Mar 28, 2023
Merged

[REVIEW] Fix branch version in CI scripts #13029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,5 @@ jobs:
build_type: pull-request
package-name: dask_cudf
# Install the cudf we just built, and also test against latest dask/distributed/dask-cuda.
test-before: "RAPIDS_PY_WHEEL_NAME=cudf_cu11 rapids-download-wheels-from-s3 ./local-cudf-dep && python -m pip install --no-deps ./local-cudf-dep/cudf*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04"
test-before: "RAPIDS_PY_WHEEL_NAME=cudf_cu11 rapids-download-wheels-from-s3 ./local-cudf-dep && python -m pip install --no-deps ./local-cudf-dep/cudf*.whl && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.06"
test-unittest: "python -m pytest -v -n 8 ./python/dask_cudf/dask_cudf/tests"
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ jobs:
sha: ${{ inputs.sha }}
package-name: dask_cudf
# Test against latest dask/distributed/dask-cuda.
test-before: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04"
test-before: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.06"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this automated correctly? It looks like line 104 of update-version.sh should've fixed this. Here's raft's code, for comparison:

https://github.com/rapidsai/raft/blob/22ebc72e8c0c2738a30a0bbf9b0efc52736eddd6/ci/release/update-version.sh#L64-L67

Copy link
Contributor Author

@galipremsagar galipremsagar Mar 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

It is automated correctly in cudf:

https://github.com/rapidsai/cudf/blob/branch-23.04/ci/release/update-version.sh#L101

I verified running it locally and the script did the job locally and should've upgraded this automatically in CI too but looks like somehow it didn't change this value.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like this is a BSD sed vs GNU sed issue. When I run this script during burndown, I use my Mac which uses BSD sed and it misses this change. When I updated to gsed in the update-version.sh script it worked as expected.

Let me think about how to handle this in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @raydouglass 🙏

Copy link
Member

Choose a reason for hiding this comment

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

I assume (though cannot confirm since I don't use a Mac) that the issue with that expression lies within this string: branch-[^\"\s]\+

Therefore we can probably just change this:

for FILE in .github/workflows/*.yaml; do
  sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE};
done

to this:

for FILE in .github/workflows/*.yaml; do
  sed_runner "s/dask-cuda.git@branch-[0-9][0-9].[0-9][0-9]/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE};
done

test-unittest: "python -m pytest -v -n 8 ./python/dask_cudf/dask_cudf/tests"
3 changes: 3 additions & 0 deletions ci/release/update-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ sed_runner 's/PROJECT_NUMBER = .*/PROJECT_NUMBER = '${NEXT_FULL_
# sphinx docs update
sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/cudf/source/conf.py
sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/cudf/source/conf.py
sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/dask_cudf/source/conf.py
sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/dask_cudf/source/conf.py


# bump rmm & dask-cuda
for FILE in conda/environments/*.yaml dependencies.yaml; do
Expand Down
4 changes: 2 additions & 2 deletions docs/dask_cudf/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
project = "dask-cudf"
copyright = "2018-2023, NVIDIA Corporation"
author = "NVIDIA Corporation"
version = "23.04"
release = "23.04.00"
version = "23.06"
release = "23.06.00"

language = "en"

Expand Down