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

[WIP] backports release 1.4 #1776

Merged
merged 15 commits into from
May 10, 2020
Merged

[WIP] backports release 1.4 #1776

merged 15 commits into from
May 10, 2020

Conversation

fredrikekre
Copy link
Member

No description provided.

StefanKarpinski and others added 5 commits April 17, 2020 14:33
The boolean variable that is set to true when running a GitHub action is plural.
The singular is the ID of the action.

(cherry picked from commit f84d811, PR #1693)
When doing Artifact tests, we need to be resilient to strange umasks
that we have inherited from our environment, screwing up git tree hash
calculations.  To do this, we have a `walkdir()` -> `chmod()` wrapper
function that started setting permissions on what it thought were files
(due to the fixed `follow_symlink == false` behavior in
JuliaLang/julia#35006) but were actually
directories.  This caused `chmod()` to apply `0o664` permissions to
directories, which were then inaccessible to `rm()` as it tried to
delete them.

This fixes #1716

(cherry picked from commit 7366c8c, PR #1721)
@fredrikekre fredrikekre force-pushed the fe/backports-release-1.4 branch from 3a92dbb to 00f4191 Compare April 17, 2020 12:49
@KristofferC
Copy link
Member

Maybe we should exclude "Fix that version ranges in keys for one registry also applies to vers…"? Might be better to just leave that alone for 1.4?

@fredrikekre
Copy link
Member Author

Sure.

Btw, whats up with Julia master:

ERROR: Package Pkg errored during testing
Stacktrace:
 [1] pkgerror(::String, ::Vararg{String,N} where N) at /home/travis/build/JuliaLang/Pkg.jl/src/Types.jl:52
 [2] test(::Pkg.Types.Context, ::Array{Pkg.Types.PackageSpec,1}; coverage::Bool, julia_args::Cmd, test_args::Cmd, test_fn::Nothing) at /home/travis/build/JuliaLang/Pkg.jl/src/Operations.jl:1496
 [3] test(::Pkg.Types.Context, ::Array{Pkg.Types.PackageSpec,1}; coverage::Bool, test_fn::Nothing, julia_args::Cmd, test_args::Cmd, kwargs::Base.Iterators.Pairs{Union{},Union{},Tuple{},NamedTuple{(),Tuple{}}}) at /home/travis/build/JuliaLang/Pkg.jl/src/API.jl:316
 [4] #test#68 at /home/travis/build/JuliaLang/Pkg.jl/src/API.jl:297 [inlined]
 [5] #test#65 at /home/travis/build/JuliaLang/Pkg.jl/src/API.jl:294 [inlined]
 [6] top-level scope at none:1
The command "julia --project --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test(; coverage=true)'" exited with 1.

use the PkgServer since the uuid was not set correctly. (#1772)

(cherry picked from commit 596998b, PR #1772)
@fredrikekre fredrikekre force-pushed the fe/backports-release-1.4 branch from 00f4191 to 32b8ab8 Compare April 17, 2020 13:38
@KristofferC
Copy link
Member

Feels like it could have something to do with JuliaLang/julia#35390...?

@KristofferC
Copy link
Member

Think it needs #1746. While not applicable to 1.4 Julia I think it should make the tests pass on nightly.

(cherry picked from commit 4dace43, PR #1746)
@fredrikekre
Copy link
Member Author

Thanks.

@fredrikekre fredrikekre added the release Release management and versioning. label Apr 17, 2020
fredrikekre and others added 8 commits April 23, 2020 13:56
…lecting recursively from paths (#1781)

(cherry picked from commit cf37881, PR #1781)
* Remove trailing slash from URL.

* Add test for trailing slash in URL.

Co-authored-by: Gunnar Farnebäck <gunnar.farneback@contextvision.se>
(cherry picked from commit 2f953bb)
This is a companion PR to JuliaLang/julia#35714
and accounts for a subset of the gains reported there.
The more specific implementations of `==` and `hash` avoid a `collect`;
that branch prevents many `collect`-induced invalidations via the
`iteratorsize` trick, but this change is probably a good idea anyway.

The more important and subtle one is the one in TOML._print.
This is used by a large number of methods in Pkg, so it's important
to prevent it from being invalidated.
Do to nospecialize markers, this method gets inferred for partially-
specified types, and the `a` is typically just `AbstractDict`.
However, `Iterators.Pairs` is also an AbstractDict, and the return
type of `keys` cannot be inferred from the parameters of
`AbstractDict{K,V}` because the `itr` field of a pair uses a later
parameter.

This short-circuits the whole problem by "hand-inlining" the result
of `invoke(keys, Tuple{AbstractDict})` at the call site, i.e.,
just creating a `KeySet` directly.

(cherry picked from commit d30adaf)
(cherry picked from commit a559a85)
… from file (#1751)

* improve performance of TOML parsing by reading from memory instead of file

(cherry picked from commit 47784de)
@KristofferC KristofferC merged commit 38f7268 into release-1.4 May 10, 2020
@KristofferC KristofferC deleted the fe/backports-release-1.4 branch May 10, 2020 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release Release management and versioning.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants