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-1.6: Backports for julia-1.6.4 #42147

Merged
merged 85 commits into from
Nov 13, 2021
Merged

Conversation

KristofferC
Copy link
Sponsor Member

@KristofferC KristofferC commented Sep 7, 2021

Backported CI PRs:

Need manual backport:

Contains multiple commits, manual intervention needed:

Non-merged PRs with backport label:

@KristofferC KristofferC added the release Release management and versioning. label Sep 7, 2021
@DilumAluthge
Copy link
Member

Why isn't #41707 showing up in the list?

@KristofferC
Copy link
Sponsor Member Author

Might be because it is old. The way the PR works is that it scans all PRs looking for a label and then it stops at some hardcoded date. I don't know if there is a way to get all PRs with a certain label. I can adjust the date or include it manually.

@DilumAluthge
Copy link
Member

I don't know if there is a way to get all PRs with a certain label.

Hmmm. Yeah, the GitHub API docs don't mention any such functionality.

@DilumAluthge
Copy link
Member

DilumAluthge commented Oct 4, 2021

I can adjust the date or include it manually.

Yeah, set the date to something like July 20, 2021. That should be sufficient to include #41707. If for some reason #41707 doesn't backport automatically, we can set the date even earlier to look for PRs on which #41707 depends.

@DilumAluthge
Copy link
Member

I don't know if there is a way to get all PRs with a certain label.

Maybe using the search API? Here's an example from their docs:

q=windows+label:bug+language:python+state:open&sort=created&order=asc

https://docs.github.com/en/rest/reference/search#search-issues-and-pull-requests

@vchuravy
Copy link
Member

vchuravy commented Oct 9, 2021

Ah sorry I did #42564 against the release-1.6 branch instead of backports-release-1.6, causing these conflicts.

@KristofferC
Copy link
Sponsor Member Author

KristofferC commented Oct 9, 2021

Oops. Revert and push it here?

@vchuravy
Copy link
Member

vchuravy commented Oct 9, 2021

Oops. Revert and push it here?

Done.

@KristofferC KristofferC changed the title Backports for julia-1.6.4 release-1.6: Backports for julia-1.6.4 Oct 19, 2021
@DilumAluthge
Copy link
Member

The Buildkite tests are failing because #42533 has not yet been backported.

@DilumAluthge
Copy link
Member

The Buildbot testers are failing due to two test failures in the errorshow test set:

errorshow                          (7) |        started at 2021-10-19T13:50:19.980
errorshow                          (7) |         failed at 2021-10-19T13:50:34.302
Test Failed at /buildworker/worker/tester_linux64/build/share/julia/test/errorshow.jl:319
  Expression: err_str == "TypeError: in TypeWithIntParam, in A, expected Vector{Int64}<:A<:(AbstractArray{Int64}), got Type{Vector{Float64}}"
   Evaluated: "TypeError: in TypeWithIntParam, in A, expected Vector{Int64}<:A<:(AbstractArray{Int64, N} where N), got Type{Vector{Float64}}" == "TypeError: in TypeWithIntParam, in A, expected Vector{Int64}<:A<:(AbstractArray{Int64}), got Type{Vector{Float64}}"
Test Failed at /buildworker/worker/tester_linux64/build/share/julia/test/errorshow.jl:321
  Expression: err_str == "TypeError: in TypeWithIntParam, in A, expected Vector{Int64}<:A<:(AbstractArray{Int64}), got Type{Vector{Float64}}"
   Evaluated: "TypeError: in TypeWithIntParam, in A, expected Vector{Int64}<:A<:(AbstractArray{Int64, N} where N), got Type{Vector{Float64}}" == "TypeError: in TypeWithIntParam, in A, expected Vector{Int64}<:A<:(AbstractArray{Int64}), got Type{Vector{Float64}}"

@KristofferC
Copy link
Sponsor Member Author

ada1cd2 probably needs a tweak

@DilumAluthge
Copy link
Member

Contains multiple commits, manual intervention needed:

😭 I thought I'd squashed when merging.

If #42802 had multiple commits, then all of them should be backported.

@DilumAluthge
Copy link
Member

Hmmm. It definitely looks like I squashed when merging. Why is it showing up under "contains multiple commits"?

@KristofferC
Copy link
Sponsor Member Author

KristofferC commented Oct 29, 2021

Maybe some bug in the script :) It does however have a conflict.

@DilumAluthge
Copy link
Member

It does however have a conflict.

That PR only touches Buildkite files. So if there's a conflict, that means I forgot to add the backport label to another CI PR.

Any chance that you have a log or anything that gives details on the merge conflicts?

@KristofferC
Copy link
Sponsor Member Author

It was #42444.

@DilumAluthge
Copy link
Member

It was #42444.

Thanks for tracking that down!

@jeremiahpslewis
Copy link
Sponsor Contributor

Hi! (Not entirely sure if this is the right place to ask this question, please let me know.) Would it make sense for #39769, e.g. GMP 6.2.0 -> 6.2.1 to be added to the 1.6 backports?

DilumAluthge and others added 21 commits November 12, 2021 09:49
…"network-related stdlibs" that we test in a separate Buildkite job (#42885)

(cherry picked from commit 8e87263)
Analogous to 236523f, we don't need to search in `@loader_path/julia` anymore, as `libjulia-internal` is now consistently within the same directory as our other dependencies.

(cherry picked from commit 486c8de)
… "Create Buildbot Statuses" workflow (#42985)

(cherry picked from commit 9bb8a6f)
…r if networking is unavailable (#42889)

(cherry picked from commit 31b9fd2)
Without this `TakeWhile` has `eltype` of `Any`

(cherry picked from commit ab0c6dd)
… the `TMPDIR` environment variable while running the test (#43012)

(cherry picked from commit ac2ee4d)
The FreeBSD binaries for this build are built with FreeBSD 12 rather
than FreeBSD 11, which will work around issue #34627.

(cherry picked from commit 5e1670e)
This adds libunwind PR 308 as a patch and updates LibUnwind_jll to use a
version with that patch included.

(cherry picked from commit 96a99c2)
@KristofferC
Copy link
Sponsor Member Author

@nanosoldier runtests(["ADI", "AlgamesDriving", "AlgorithmsCollection", "ArrayLayouts", "BLASBenchmarksCPU", "BayesianQuadrature", "BlockArrays", "BytePairEncoding", "ClassicalOrthogonalPolynomials", "ControlSystemIdentification", "CorrelationFunctions", "Cropbox", "DIVAnd", "DataDeps", "DecisionTree", "DynamicalSystemsBase", "EmailScraper", "FSInteraction", "FilesystemDatastructures", "FlashWeave", "GigaSOM", "Graph500", "InfiniteLinearAlgebra", "KrigingEstimators", "LazyArrays", "MCIntegration", "MarketData", "MiniLoggers", "NumericalAlgorithms", "Onda", "PackageAnalyzer", "ParquetFiles", "PastaQ", "QuantumESPRESSOExpress", "QuasiArrays", "RRTMGP", "Reactive", "RoME", "SortMark", "SyntheticDatasets", "TensorKit", "Turing", "VoronoiGraph", "YAXArrayBase"], vs = ":release-1.6")

@nanosoldier
Copy link
Collaborator

Your package evaluation job has completed - possible new issues were detected. A full report can be found here.

@KristofferC KristofferC reopened this Nov 12, 2021
@nanosoldier
Copy link
Collaborator

Your package evaluation job has completed - possible new issues were detected. A full report can be found here.

@KristofferC KristofferC merged commit f107c26 into release-1.6 Nov 13, 2021
@KristofferC KristofferC deleted the backports-release-1.6 branch November 13, 2021 12:09
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.