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

bump to libfaketime 0.9.10 #75

Merged
merged 3 commits into from
May 5, 2024
Merged

Conversation

azmeuk
Copy link
Contributor

@azmeuk azmeuk commented Apr 30, 2024

This PR brings the following things

  • update to libfaketime 0.9.10
  • remove the pre_sierra submodule, as I suspect this starts to refer to very old versions?
  • use FAKETIME_FMT environment var instead of patching libfaketime
  • deactivate libfaketime cache with the FAKETIME_NO_CACHE env var instead of patching libfaketime
  • use make/gcc compilation options instead of patch the libfaketime Makefile
  • use libfaketime upstream as git submodule, so no fork is needed
  • run GHA on macos 12, 13 and 14

fixes #63
fixes #64

@azmeuk azmeuk force-pushed the new-macos branch 2 times, most recently from 3bcf397 to f0d018d Compare April 30, 2024 16:36
- update to libfaketime 0.9.10
- the libfaketime submodules points to the upstream
- apply a patch on build
- run GHA on macos 12, 13 and 14
instead of changing the Makefile C flags in the patch
@@ -208,7 +204,13 @@ def __exit__(self, *exc):
os.environ['FAKETIME'] = self._prev_spec
else:
del os.environ['FAKETIME']
end_callback(self)
Copy link
Owner

Choose a reason for hiding this comment

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

huh, looks like this was a bug before, yeah? it should have been one level out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes I suppose, else that would imply that the end callback is only called if there was not a previous FAKETIME environment var defined, and I am not sure how it makes sense.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can do a fix for this in a separate PR if you prefer.

Copy link
Owner

Choose a reason for hiding this comment

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

looks like it's been fixed. I just wanted to double check it.

@simon-weber
Copy link
Owner

This looks fantastic; thanks! It'll be so much easier to upgrade libfaketime now.

@simon-weber simon-weber merged commit 8f54687 into simon-weber:master May 5, 2024
40 checks passed
@azmeuk azmeuk deleted the new-macos branch May 5, 2024 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants