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

Apply addition of discardBuffer to ZnBufferedReadStream>>#readInto:startingAt:count in the case that the buffer is bypassed #17055

Merged
merged 1 commit into from
Sep 9, 2024

Conversation

Rinzwind
Copy link
Contributor

This pull request applies the changes from Zinc commit ca180a2. This is related to issue #14235.

…t […] Add discardBuffer to ZnBufferedReadStream>>#readInto:startingAt:count in the case that the buffer is bypassed”).
@demarey
Copy link
Contributor

demarey commented Sep 9, 2024

Thanks for the contribution.

@demarey demarey merged commit 2e4d037 into pharo-project:Pharo13 Sep 9, 2024
1 of 2 checks passed
@Ducasse
Copy link
Member

Ducasse commented Sep 9, 2024

Thanks a lot Kris this is cool to have you around and contributing.

Rinzwind added a commit to Rinzwind/pharo that referenced this pull request Sep 13, 2024
…(“Patch production build. There is a bug in the collaboration between ZipArchive and Zinc buffered streams that […]”) as the patch should no longer be necessary since the merge of pull request pharo-project#17055 (“Apply addition of discardBuffer to ZnBufferedReadStream>>#readInto:startingAt:count in […]”).
@Rinzwind
Copy link
Contributor Author

@demarey Pharo Launcher also fails to extract some of the ZIP files from our Jenkins server. I backported this fix to Pharo 12 in pull request #17112. It would be nice to have Pharo Launcher updated to Pharo 12 so it has the fix. I could backport the fix to Pharo 11 as well, but another reason to update to Pharo 12 would be Pharo Launcher issue #695.

@Rinzwind
Copy link
Contributor Author

@demarey I opened a pull request to backport the fix to Pharo 11 as well: pull request #17382.

@Rinzwind
Copy link
Contributor Author

@demarey Pull request #17382 was merged and a new Pharo 11 image including the fix is available (build 733), could you maybe update Pharo Launcher as well?

@jecisc
Copy link
Member

jecisc commented Nov 27, 2024

The launcher should take the latest image automatically normally

@Rinzwind
Copy link
Contributor Author

@jecisc I’m not sure I understand what you mean, I meant to have Pharo Launcher itself updated. We use a ‘private’ template category for our Jenkins server. Creating an image from some of its templates signals an error at the step ‘Extracting archive to target directory’. Pharo Launcher v3.2 is based on Pharo 11 build 726 so it doesn’t yet have the fix for issue #14235.

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.

4 participants