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.

Sign up for GitHub

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

Jump to bottom

swift: 4.1.3 -> 4.2.1 #49605

Merged
merged 1 commit into from Nov 2, 2018
Merged

swift: 4.1.3 -> 4.2.1 #49605

merged 1 commit into from Nov 2, 2018

Conversation

mroi
Copy link
Contributor

@mroi mroi commented Nov 1, 2018

I updated Swift to the current version 4.2.1. This involved some additional patching to get things to build correctly.

I am especially unsure about disabling the two test phases stress-test and test-optimized. They had minor failures related to the tests not finding tools like find. I already found other tests disabled in a similar fashion, so I just added these test phases there.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@mroi
swift: 4.1.3 -> 4.2.1
4e89814 
* necessary tweaks and patches to get swift 4.2.1 to build
* disabled more tests because they would require additional patching
* delete empty directories from final build output
* some minor cleanup
@dtzWill
Copy link
Member

dtzWill commented Nov 2, 2018

LGTM, thanks!

Tried with a few example projects, seems to work as expected!

I don't think it's a big deal re:tests, but on the other hand 'find' hopefully isn't too hard to make available.
Looks like it is available already so I suppose it'll need some build system fixups (hardcoded paths probably)?

Well if you want to look into it feel free but I'm good with this as-is.

@dtzWill dtzWill merged commit 6753b2c into NixOS:master Nov 2, 2018
@dtzWill
Copy link
Member

dtzWill commented Nov 2, 2018

In case anyone runs into this (somehow), apparently it doesn't build w/clang7 but does using clang5. Haven't tried clang6.

Error is in commit message: dtzWill@45c5a94 .

@mroi
Copy link
Contributor Author

mroi commented Nov 4, 2018

Thanks for your feedback. I will keep a note to look into the tests later.
Yes, file should be included already, so I guess there is a hardcoded path somewhere.

@mroi mroi deleted the swift-4.2.1 branch November 4, 2018 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mroi @dtzWill @GrahamcOfBorg