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

win: Remove libexpat-1.dll from package.sh #3479

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Conversation

landam
Copy link
Member

@landam landam commented Mar 9, 2024

This PR replaces #3476 (base branch changed from releasebranch_8_3 to main)

@landam landam self-assigned this Mar 9, 2024
@landam landam added this to the 8.3.3 milestone Mar 9, 2024
@landam landam added the windows Microsoft Windows specific label Mar 9, 2024
@landam landam modified the milestones: 8.3.3, 8.4.0 Mar 9, 2024
Copy link
Member

@echoix echoix left a comment

Choose a reason for hiding this comment

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

It is the same changes as the original PR. I assume that since you had the need to recreate it for the correct branch, that it was implicitly approved by you originally. (I was good with the previous one, but didn't know if there would be unforeseen problems with it). So I'm approving and merging to follow explicitly the branch restrictions in place.

@echoix
Copy link
Member

echoix commented Mar 11, 2024

I'm not merging yet: Would you want to add a co-authored by tag in the squash merge message to attribute it to the original author too?

@neteler
Copy link
Member

neteler commented Mar 11, 2024

There should definitely be added the co-authored by tag for @jef-n .

@echoix echoix merged commit 2d1cb6e into OSGeo:main Mar 13, 2024
25 checks passed
@echoix
Copy link
Member

echoix commented Mar 13, 2024

Thanks again @jef-n for your contribution! It has been merged.

@neteler or other backporters, it can not be backported to 8.3 as he originally filed.

As a post mortem, was changing the base branch in the PR's UI so it would apply to main really not working?

@neteler
Copy link
Member

neteler commented Mar 13, 2024

@neteler or other backporters, it can not be backported to 8.3 as he originally filed.

Ok but then we could simply merge #3476, right?

As a post mortem, was changing the base branch in the PR's UI so it would apply to main really not working?

I also don't know why @landam didn't simply switch it to "main".

neteler pushed a commit that referenced this pull request Mar 18, 2024
@neteler
Copy link
Member

neteler commented Mar 18, 2024

Backported by cherry-picking to G83 in b076b0c

@neteler neteler modified the milestones: 8.4.0, 8.3.3 Mar 18, 2024
@wenzeslaus wenzeslaus changed the title Remove libexpat-1.dll from package.sh win: Remove libexpat-1.dll from package.sh Jun 15, 2024
@neteler neteler modified the milestones: 8.3.3, 8.4.0 Jul 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
windows Microsoft Windows specific
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants