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

release-windows.yml: fixed collecting files [skip ci] #6904

Merged
merged 2 commits into from
Oct 11, 2024

Conversation

firewave
Copy link
Collaborator

No description provided.

@firewave firewave changed the title fixed Windows release build release-windows.yml: fixed collecting files Oct 11, 2024
@firewave
Copy link
Collaborator Author

https://github.com/danmar/cppcheck/actions/runs/11283837769/job/31383985732

Run move build\bin\Release win_installer\files || exit /b !errorlevel!
        1 dir(s) moved.
A subdirectory or file win_installer\files\addons already exists.

No idea how this broke because it was working fine within the PR but now fails with

@firewave
Copy link
Collaborator Author

No idea how this broke because it was working fine within the PR but now fails with

This broke because of #6882. Which is actually good as it exposed redundant code.

@firewave
Copy link
Collaborator Author

@firewave firewave changed the title release-windows.yml: fixed collecting files release-windows.yml: fixed collecting files [skip ci] Oct 11, 2024
@firewave firewave marked this pull request as ready for review October 11, 2024 17:29
@firewave firewave merged commit d23c88d into danmar:main Oct 11, 2024
@firewave firewave deleted the release-win branch October 11, 2024 21:18
@firewave
Copy link
Collaborator Author

This obliterated the whole CI...

@firewave
Copy link
Collaborator Author

Sh... how can we restore the history?!?!?!? Please do not push anything to the master.

@chrchr-github @orbitcowboy @pfultz2

@danmar I might need owner permissions to fix this.

danmar added a commit to cppchecksolutions/cppcheck that referenced this pull request Oct 13, 2024
@firewave
Copy link
Collaborator Author

@ludviggunne forgot to mention you - please do not merge anything.

@firewave
Copy link
Collaborator Author

The GitHub Desktop application let's me squash commits and apparently force-push (whereas my IDE doesn't).

So I could easily fix that if given the OK.

The amount of people which have pulled the change into their fork is extremely small so the fallout should minimal.

Although @danmar pointed out that it will most likely break daca. I will take care of that by introducing a workaround. That is not good but it would get rid of the outdated clients (which I would have preferred to do in a different way).

@danmar
Copy link
Owner

danmar commented Oct 14, 2024

I don't see how to give you write permission.

@danmar
Copy link
Owner

danmar commented Oct 14, 2024

I could drop the commit from the history if you like. git rebase and drop.

I will take care of that by introducing a workaround.

I am not sure how it can be worked around.. do you suggest that the donate-cpu.py script will automatically restore the repo. but donate-cpu.py scripts must still be restarted in some way, right?

@firewave
Copy link
Collaborator Author

I am not sure how it can be worked around.. do you suggest that the donate-cpu.py script will automatically restore the repo. but donate-cpu.py scripts must still be restarted in some way, right?

Yes. Users need to update it - but most of them usually do. In #6455 I outline how users gain an "auto-update".

@danmar
Copy link
Owner

danmar commented Oct 14, 2024

Users need to update it - but most of them usually do.

but this time it will not work well with a "git pull". I assume they use "git pull".

@firewave
Copy link
Collaborator Author

but this time it will not work well with a "git pull". I assume they use "git pull".

So far it is very few people which are affected (only six people outside of the team so far got the bad change) so it should not be an issue getting the script but within the script itself which I will address.

@danmar
Copy link
Owner

danmar commented Oct 14, 2024

I have dropped the commit so now you can try to fix.

firewave added a commit to firewave/cppcheck that referenced this pull request Oct 14, 2024
@firewave
Copy link
Collaborator Author

I have dropped the commit so now you can try to fix.

That already fixed it. I will prepare a new PR which fixed the release job.

Everybody else - please rebase and drop the now stray commit from your branches.

@firewave
Copy link
Collaborator Author

@olabetskyi @jhnc-oss @MatrixMike @rghe @makesoftwaresafe @sthagen

I tagged you in this ticket to inform you that we had to drop the commit for this MR from the main branch and perform a force-push because it removed files it shouldn't have and we would have lost the revision history (i.e. git blame) otherwise (see above). I am sincerely apologize for any problems caused by this and hope things can be resolved fast and easily.

So far it seems you simply need to drop the commit in question from your up-to-date branches and everything should be fine.

I will try to help out as much as I can if further issues arise.

@firewave firewave restored the release-win branch October 14, 2024 16:38
@firewave firewave deleted the release-win branch October 14, 2024 16:40
@sthagen
Copy link
Contributor

sthagen commented Oct 14, 2024

@firewave thanks.

@firewave
Copy link
Collaborator Author

#6917 fixes the daca client.

firewave added a commit to firewave/cppcheck that referenced this pull request Oct 14, 2024
olabetskyi pushed a commit to olabetskyi/cppcheck that referenced this pull request Oct 15, 2024
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