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

Remove temporary circshift direction workaround #272

Merged
merged 3 commits into from
Nov 5, 2022
Merged

Conversation

dkarrasch
Copy link
Member

Will the Base PR be backported to v1.8.2, or not? I.e., can this be included in our backport PR, which hopefully still makes it for v1.8.2?

@fredrikekre
Copy link
Member

Probably too late for 1.8.2, but will be in 1.8.3 I suppose. At this point I believe #252 is too late for 1.8.2 too, unfortunately.

@codecov-commenter
Copy link

codecov-commenter commented Sep 29, 2022

Codecov Report

Merging #272 (0560b16) into main (fa54768) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #272      +/-   ##
==========================================
- Coverage   92.03%   92.02%   -0.02%     
==========================================
  Files          12       12              
  Lines        7334     7334              
==========================================
- Hits         6750     6749       -1     
- Misses        584      585       +1     
Impacted Files Coverage Δ
src/SparseArrays.jl 76.47% <ø> (-5.89%) ⬇️
src/sparsematrix.jl 95.37% <100.00%> (ø)
src/sparsevector.jl 95.01% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@dkarrasch dkarrasch merged commit 311b4b4 into main Nov 5, 2022
@dkarrasch dkarrasch deleted the dk/rm_workaround branch November 5, 2022 09:58
@github-actions
Copy link

github-actions bot commented Nov 5, 2022

The backport to 1.8 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.8 1.8
# Navigate to the new working tree
cd .worktrees/backport-1.8
# Create a new branch
git switch --create backport-272-to-1.8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 311b4b4130d9f28a6b5eb55cb7c818e4f7858719
# Push it to GitHub
git push --set-upstream origin backport-272-to-1.8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.8

Then, create a pull request where the base branch is 1.8 and the compare/head branch is backport-272-to-1.8.

@dkarrasch
Copy link
Member Author

Just for reference: the Base PR is going to be included in v1.8.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants