promote i586-unknown-linux-gnu to Tier2+hosttools #108716

goshhhy · 2023-03-03T23:16:22Z

rustbot · 2023-03-03T23:16:30Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pietroalbini (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

src/ci/github-actions/ci.yml

pietroalbini · 2023-03-05T16:59:38Z

@bors r+ rollup=iffy

bors · 2023-03-05T16:59:40Z

📌 Commit bd24e9a has been approved by pietroalbini

It is now in the queue for this repository.

bors · 2023-03-06T03:47:20Z

⌛ Testing commit bd24e9a with merge 296fed4078a2bb2b01ba430b5b79299690df1ce2...

bors · 2023-03-06T04:19:56Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-03-06T20:33:52Z

The job dist-i586-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[154/3023] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Threading.cpp.o
[155/3023] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/YAMLTraits.cpp.o
[156/3023] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Process.cpp.o
In file included from /checkout/src/llvm-project/llvm/lib/Support/Process.cpp:107:
/checkout/src/llvm-project/llvm/lib/Support/Unix/Process.inc: In static member function ‘static size_t llvm::sys::Process::GetMallocUsage()’:
/checkout/src/llvm-project/llvm/lib/Support/Unix/Process.inc:97:10: warning: ‘mallinfo mallinfo()’ is deprecated [-Wdeprecated-declarations]
   97 |   mi = ::mallinfo();
In file included from /checkout/src/llvm-project/llvm/lib/Support/Unix/Process.inc:34,
                 from /checkout/src/llvm-project/llvm/lib/Support/Process.cpp:107:
/usr/include/malloc.h:114:24: note: declared here
/usr/include/malloc.h:114:24: note: declared here
  114 | extern struct mallinfo mallinfo (void) __THROW __MALLOC_DEPRECATED;
In file included from /checkout/src/llvm-project/llvm/lib/Support/Process.cpp:107:
/checkout/src/llvm-project/llvm/lib/Support/Unix/Process.inc:97:18: warning: ‘mallinfo mallinfo()’ is deprecated [-Wdeprecated-declarations]
   97 |   mi = ::mallinfo();
      |        ~~~~~~~~~~^~
      |        ~~~~~~~~~~^~
In file included from /checkout/src/llvm-project/llvm/lib/Support/Unix/Process.inc:34,
                 from /checkout/src/llvm-project/llvm/lib/Support/Process.cpp:107:
/usr/include/malloc.h:114:24: note: declared here
  114 | extern struct mallinfo mallinfo (void) __THROW __MALLOC_DEPRECATED;
[157/3023] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/raw_ostream.cpp.o
[158/3023] Building CXX object lib/TableGen/CMakeFiles/LLVMTableGen.dir/StringMatcher.cpp.o
[159/3023] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Host.cpp.o
[160/3023] Building CXX object lib/TableGen/CMakeFiles/LLVMTableGen.dir/TableGenBackendSkeleton.cpp.o
---
      |       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[291/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/IRPrintingPasses.cpp.o
[292/3023] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/GlobalISelEmitter.cpp.o
[293/3023] Linking CXX executable bin/llvm-tblgen
FAILED: bin/llvm-tblgen 
: && /usr/bin/c++ -ffunction-sections -fdata-sections -fPIC -m32 -march=pentium -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG -Wl,-Bsymbolic -static-libstdc++    -Wl,-rpath-link,/checkout/obj/build/i586-unknown-linux-gnu/llvm/build/./lib  -Wl,--gc-sections utils/TableGen/CMakeFiles/llvm-tblgen.dir/AsmMatcherEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/AsmWriterEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/AsmWriterInst.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/Attributes.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CallingConvEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeEmitterGen.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenDAGPatterns.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenHwModes.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenInstruction.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenMapTable.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenRegisters.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenSchedule.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenTarget.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DAGISelEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DAGISelMatcherEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DAGISelMatcherGen.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DAGISelMatcherOpt.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DAGISelMatcher.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DecoderEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DFAEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DFAPacketizerEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DirectiveEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DisassemblerEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/DXILEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/ExegesisEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/FastISelEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/GICombinerEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/GlobalISelEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/InfoByHwMode.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/InstrInfoEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/InstrDocsEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/IntrinsicEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/OptEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/OptParserEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/OptRSTEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/PredicateExpander.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/PseudoLoweringEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CompressInstEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/RegisterBankEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/RegisterInfoEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/SDNodeProperties.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/SearchableTableEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/SubtargetEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/SubtargetFeatureInfo.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/TableGen.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/Types.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/VarLenCodeEmitterGen.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/X86DisassemblerTables.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/X86EVEX2VEXTablesEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/X86FoldTablesEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/X86MnemonicTables.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/X86ModRMFilters.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/X86RecognizableInstr.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/WebAssemblyDisassemblerEmitter.cpp.o utils/TableGen/CMakeFiles/llvm-tblgen.dir/CTagsEmitter.cpp.o -o bin/llvm-tblgen -L/x-tools/i586-unknown-linux-gnu/lib/gcc/i586-unknown-linux-gnu/8.3.0   -L/x-tools/i586-unknown-linux-gnu/i586-unknown-linux-gnu/lib   -L/x-tools/i586-unknown-linux-gnu/i586-unknown-linux-gnu/sysroot/lib   -L/x-tools/i586-unknown-linux-gnu/i586-unknown-linux-gnu/sysroot/usr/lib -Wl,-rpath,"\$ORIGIN/../lib"  lib/libLLVMSupport.a  lib/libLLVMTableGen.a  -lpthread  lib/libLLVMTableGenGlobalISel.a  lib/libLLVMTableGen.a  lib/libLLVMSupport.a  -lrt  -ldl  -lpthread  -lm  lib/libLLVMDemangle.a && :
/usr/bin/ld: cannot find /lib/libpthread.so.0: No such file or directory
/usr/bin/ld: cannot find /usr/lib/libpthread_nonshared.a: No such file or directory
collect2: error: ld returned 1 exit status
[295/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/AsmWriter.cpp.o
[296/3023] Building CXX object lib/Bitcode/Writer/CMakeFiles/LLVMBitWriter.dir/BitcodeWriter.cpp.o
[297/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/Globals.cpp.o
[298/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/AutoUpgrade.cpp.o
---
[305/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/DebugInfoMetadata.cpp.o
[306/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/Dominators.cpp.o
[307/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/Instructions.cpp.o
[308/3023] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/LLVMContextImpl.cpp.o
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit status: 1


build script failed, must exit now', /cargo/registry/src/index.crates.io-6f17d22bba15001f/cmake-0.1.48/src/lib.rs:975:5
 finished in 58.950 seconds
Build completed unsuccessfully in 0:10:00

workingjubilee · 2023-03-07T03:13:35Z

[293/3023] Linking CXX executable bin/llvm-tblgen
FAILED: bin/llvm-tblgen
(snip a bunch of hot nonsense)
/usr/bin/ld: cannot find /lib/libpthread.so.0: No such file or directory
/usr/bin/ld: cannot find /usr/lib/libpthread_nonshared.a: No such file or directory
collect2: error: ld returned 1 exit status
(snip building a few other items)
ninja: build stopped: subcommand failed.

Looks like we need to throw more stuff where LLVM can find it.

bors · 2023-03-19T23:28:38Z

☔ The latest upstream changes (presumably #109332) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2023-04-01T07:04:46Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout i586-tier2-hosttools (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self i586-tier2-hosttools --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Adding src/tools/rust-installer/test/image5/dir-to-install/foo
Adding src/tools/rust-installer/test/image4/dir-to-install/qux/bar
Adding src/tools/rust-installer/test/image4/baz
Adding src/tools/rust-installer/test/image3/bin/cargo
Adding src/tools/rust-installer/test/image2/something-to-install
Adding src/tools/rust-installer/test/image2/dir-to-install/bar
Adding src/tools/rust-installer/test/image2/bin/oldprogram
Adding src/tools/rust-installer/test/image1/something-to-not-install
Adding src/tools/rust-installer/test/image1/something-to-install
Adding src/tools/rust-installer/test/image1/dir-to-not-install/foo
Adding src/tools/rust-installer/test/image1/dir-to-install/foo
Adding src/tools/rust-installer/test/image1/bin/program2
Adding src/tools/rust-installer/test/image1/bin/program
Adding src/tools/rust-installer/test/image1/bin/bad-bin
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/cargodocs.txt
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/README
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/rustdocs.txt
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/README
Adding src/tools/rust-installer/test.sh
Adding src/tools/rust-installer/src/util.rs
Adding src/tools/rust-installer/src/tarballer.rs
Adding src/tools/rust-installer/src/scripter.rs
Adding src/tools/rust-installer/src/remove_dir_all.rs
Adding src/tools/rust-installer/src/main.rs
Adding src/tools/rust-installer/src/lib.rs
Adding src/tools/rust-installer/src/generator.rs
Adding src/tools/rust-installer/src/compression.rs
Adding src/tools/rust-installer/src/combiner.rs
Adding src/tools/rust-installer/rust-installer-version
Adding src/tools/rust-installer/make-tarballs.sh
Adding src/tools/rust-installer/install-template.sh
Adding src/tools/rust-installer/gen-installer.sh
Adding src/tools/rust-installer/gen-install-script.sh
Adding src/tools/rust-installer/combine-installers.sh
Adding src/tools/rust-installer/README.md
Adding src/tools/rust-installer/Cargo.toml
Adding src/tools/rust-installer/.gitignore
Auto-merging src/doc/rustc/src/platform-support.md
Auto-merging src/ci/github-actions/ci.yml
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
Automatic merge failed; fix conflicts and then commit the result.

bors · 2023-04-05T16:15:19Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout i586-tier2-hosttools (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self i586-tier2-hosttools --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Adding src/tools/rust-installer/test/image5/dir-to-install/foo
Adding src/tools/rust-installer/test/image4/dir-to-install/qux/bar
Adding src/tools/rust-installer/test/image4/baz
Adding src/tools/rust-installer/test/image3/bin/cargo
Adding src/tools/rust-installer/test/image2/something-to-install
Adding src/tools/rust-installer/test/image2/dir-to-install/bar
Adding src/tools/rust-installer/test/image2/bin/oldprogram
Adding src/tools/rust-installer/test/image1/something-to-not-install
Adding src/tools/rust-installer/test/image1/something-to-install
Adding src/tools/rust-installer/test/image1/dir-to-not-install/foo
Adding src/tools/rust-installer/test/image1/dir-to-install/foo
Adding src/tools/rust-installer/test/image1/bin/program2
Adding src/tools/rust-installer/test/image1/bin/program
Adding src/tools/rust-installer/test/image1/bin/bad-bin
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/cargodocs.txt
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/README
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/rustdocs.txt
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/README
Adding src/tools/rust-installer/test.sh
Adding src/tools/rust-installer/src/util.rs
Adding src/tools/rust-installer/src/tarballer.rs
Adding src/tools/rust-installer/src/scripter.rs
Adding src/tools/rust-installer/src/remove_dir_all.rs
Adding src/tools/rust-installer/src/main.rs
Adding src/tools/rust-installer/src/lib.rs
Adding src/tools/rust-installer/src/generator.rs
Adding src/tools/rust-installer/src/compression.rs
Adding src/tools/rust-installer/src/combiner.rs
Adding src/tools/rust-installer/rust-installer-version
Adding src/tools/rust-installer/make-tarballs.sh
Adding src/tools/rust-installer/install-template.sh
Adding src/tools/rust-installer/gen-installer.sh
Adding src/tools/rust-installer/gen-install-script.sh
Adding src/tools/rust-installer/combine-installers.sh
Adding src/tools/rust-installer/README.md
Adding src/tools/rust-installer/Cargo.toml
Adding src/tools/rust-installer/.gitignore
Auto-merging src/doc/rustc/src/platform-support.md
Auto-merging src/ci/github-actions/ci.yml
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
Automatic merge failed; fix conflicts and then commit the result.

Dylan-DPC · 2023-05-20T09:59:20Z

@goshhhy any updates on this?

bors · 2023-05-22T12:11:16Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout i586-tier2-hosttools (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self i586-tier2-hosttools --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Adding src/tools/rust-installer/test/image5/dir-to-install/foo
Adding src/tools/rust-installer/test/image4/dir-to-install/qux/bar
Adding src/tools/rust-installer/test/image4/baz
Adding src/tools/rust-installer/test/image3/bin/cargo
Adding src/tools/rust-installer/test/image2/something-to-install
Adding src/tools/rust-installer/test/image2/dir-to-install/bar
Adding src/tools/rust-installer/test/image2/bin/oldprogram
Adding src/tools/rust-installer/test/image1/something-to-not-install
Adding src/tools/rust-installer/test/image1/something-to-install
Adding src/tools/rust-installer/test/image1/dir-to-not-install/foo
Adding src/tools/rust-installer/test/image1/dir-to-install/foo
Adding src/tools/rust-installer/test/image1/bin/program2
Adding src/tools/rust-installer/test/image1/bin/program
Adding src/tools/rust-installer/test/image1/bin/bad-bin
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/cargodocs.txt
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/README
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/rustdocs.txt
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/README
Adding src/tools/rust-installer/test.sh
Adding src/tools/rust-installer/src/util.rs
Adding src/tools/rust-installer/src/tarballer.rs
Adding src/tools/rust-installer/src/scripter.rs
Adding src/tools/rust-installer/src/main.rs
Adding src/tools/rust-installer/src/lib.rs
Adding src/tools/rust-installer/src/generator.rs
Adding src/tools/rust-installer/src/compression.rs
Adding src/tools/rust-installer/src/combiner.rs
Adding src/tools/rust-installer/rust-installer-version
Adding src/tools/rust-installer/make-tarballs.sh
Adding src/tools/rust-installer/install-template.sh
Adding src/tools/rust-installer/gen-installer.sh
Adding src/tools/rust-installer/gen-install-script.sh
Adding src/tools/rust-installer/combine-installers.sh
Adding src/tools/rust-installer/README.md
Adding src/tools/rust-installer/Cargo.toml
Adding src/tools/rust-installer/.gitignore
Auto-merging src/doc/rustc/src/platform-support.md
Auto-merging src/ci/github-actions/ci.yml
CONFLICT (content): Merge conflict in src/ci/github-actions/ci.yml
CONFLICT (file location): src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.defconfig added in HEAD inside a directory that was renamed in heads/homu-tmp, suggesting it should perhaps be moved to src/ci/docker/host-x86_64/dist-i586-linux/i586-linux-gnu.defconfig.
CONFLICT (rename/delete): src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config deleted in HEAD and renamed to src/ci/docker/host-x86_64/dist-i586-linux/i586-linux-gnu.config in heads/homu-tmp. Version heads/homu-tmp of src/ci/docker/host-x86_64/dist-i586-linux/i586-linux-gnu.config left in tree.
CONFLICT (rename/delete): src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/build-i586-gnu-toolchain.sh deleted in HEAD and renamed to src/ci/docker/host-x86_64/dist-i586-linux/build-i586-gnu-toolchain.sh in heads/homu-tmp. Version heads/homu-tmp of src/ci/docker/host-x86_64/dist-i586-linux/build-i586-gnu-toolchain.sh left in tree.
Auto-merging src/ci/docker/host-x86_64/dist-i586-i686-musl/Dockerfile
CONFLICT (content): Merge conflict in src/ci/docker/host-x86_64/dist-i586-i686-musl/Dockerfile
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 1856 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

workingjubilee · 2023-05-22T22:46:54Z

Oh, this is probably stuck without further guidance. I was going to investigate and try to help but I wound up distracted, unfortunately.

bors · 2023-07-14T07:20:25Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout i586-tier2-hosttools (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self i586-tier2-hosttools --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Adding src/tools/rust-installer/test/image5/dir-to-install/foo
Adding src/tools/rust-installer/test/image4/dir-to-install/qux/bar
Adding src/tools/rust-installer/test/image4/baz
Adding src/tools/rust-installer/test/image3/bin/cargo
Adding src/tools/rust-installer/test/image2/something-to-install
Adding src/tools/rust-installer/test/image2/dir-to-install/bar
Adding src/tools/rust-installer/test/image2/bin/oldprogram
Adding src/tools/rust-installer/test/image1/something-to-not-install
Adding src/tools/rust-installer/test/image1/something-to-install
Adding src/tools/rust-installer/test/image1/dir-to-not-install/foo
Adding src/tools/rust-installer/test/image1/dir-to-install/foo
Adding src/tools/rust-installer/test/image1/bin/program2
Adding src/tools/rust-installer/test/image1/bin/program
Adding src/tools/rust-installer/test/image1/bin/bad-bin
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/cargodocs.txt
Adding src/tools/rust-installer/test/image-docdir2/share/doc/cargo/README
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/rustdocs.txt
Adding src/tools/rust-installer/test/image-docdir1/share/doc/rust/README
Adding src/tools/rust-installer/test.sh
Adding src/tools/rust-installer/src/util.rs
Adding src/tools/rust-installer/src/tarballer.rs
Adding src/tools/rust-installer/src/scripter.rs
Adding src/tools/rust-installer/src/main.rs
Adding src/tools/rust-installer/src/lib.rs
Adding src/tools/rust-installer/src/generator.rs
Adding src/tools/rust-installer/src/compression.rs
Adding src/tools/rust-installer/src/combiner.rs
Adding src/tools/rust-installer/rust-installer-version
Adding src/tools/rust-installer/make-tarballs.sh
Adding src/tools/rust-installer/install-template.sh
Adding src/tools/rust-installer/gen-installer.sh
Adding src/tools/rust-installer/gen-install-script.sh
Adding src/tools/rust-installer/combine-installers.sh
Adding src/tools/rust-installer/README.md
Adding src/tools/rust-installer/Cargo.toml
Adding src/tools/rust-installer/.gitignore
Auto-merging src/doc/rustc/src/platform-support.md
CONFLICT (content): Merge conflict in src/doc/rustc/src/platform-support.md
Auto-merging src/ci/github-actions/ci.yml
CONFLICT (content): Merge conflict in src/ci/github-actions/ci.yml
CONFLICT (file location): src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.defconfig added in HEAD inside a directory that was renamed in heads/homu-tmp, suggesting it should perhaps be moved to src/ci/docker/host-x86_64/dist-i586-linux/i586-linux-gnu.defconfig.
CONFLICT (rename/delete): src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/i586-linux-gnu.config deleted in HEAD and renamed to src/ci/docker/host-x86_64/dist-i586-linux/i586-linux-gnu.config in heads/homu-tmp. Version heads/homu-tmp of src/ci/docker/host-x86_64/dist-i586-linux/i586-linux-gnu.config left in tree.
CONFLICT (rename/delete): src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/build-i586-gnu-toolchain.sh deleted in HEAD and renamed to src/ci/docker/host-x86_64/dist-i586-linux/build-i586-gnu-toolchain.sh in heads/homu-tmp. Version heads/homu-tmp of src/ci/docker/host-x86_64/dist-i586-linux/build-i586-gnu-toolchain.sh left in tree.
Auto-merging src/ci/docker/host-x86_64/dist-i586-i686-musl/Dockerfile
CONFLICT (content): Merge conflict in src/ci/docker/host-x86_64/dist-i586-i686-musl/Dockerfile
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3476 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

JohnCSimon · 2023-08-27T06:11:52Z

@goshhhy
Ping from triage: I'm closing this due to inactivity, Please reopen when you are ready to continue with this.
Note: if you are going to continue please open the PR BEFORE you push to it, else you won't be able to reopen - this is a quirk of github.
Thanks for your contribution.

@rustbot label: +S-inactive

promote i586-unknown-linux-gnu to Tier2+hosttools

1266e8d

mcp: rust-lang/compiler-team#543

rustbot assigned pietroalbini Mar 3, 2023

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 3, 2023

workingjubilee reviewed Mar 3, 2023

View reviewed changes

src/ci/github-actions/ci.yml Show resolved Hide resolved

expand yaml anchors to fix CI

bd24e9a

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2023

aliemjay mentioned this pull request Apr 15, 2023

Rollup of 10 pull requests #110359

Closed

Dylan-DPC added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2023

TaKO8Ki mentioned this pull request Jun 27, 2023

Rollup of 18 pull requests #113097

Closed

nikic mentioned this pull request Jul 25, 2023

lower baseline for i686 on unixlike targets #100969

Closed

JohnCSimon closed this Aug 27, 2023

rustbot added the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Aug 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

promote i586-unknown-linux-gnu to Tier2+hosttools #108716

promote i586-unknown-linux-gnu to Tier2+hosttools #108716

goshhhy commented Mar 3, 2023

rustbot commented Mar 3, 2023

pietroalbini commented Mar 5, 2023

bors commented Mar 5, 2023

bors commented Mar 6, 2023

bors commented Mar 6, 2023

rust-log-analyzer commented Mar 6, 2023

workingjubilee commented Mar 7, 2023

bors commented Mar 19, 2023

bors commented Apr 1, 2023

bors commented Apr 5, 2023

Dylan-DPC commented May 20, 2023

bors commented May 22, 2023

workingjubilee commented May 22, 2023

bors commented Jul 14, 2023

JohnCSimon commented Aug 27, 2023

promote i586-unknown-linux-gnu to Tier2+hosttools #108716

promote i586-unknown-linux-gnu to Tier2+hosttools #108716

Conversation

goshhhy commented Mar 3, 2023

rustbot commented Mar 3, 2023

pietroalbini commented Mar 5, 2023

bors commented Mar 5, 2023

bors commented Mar 6, 2023

bors commented Mar 6, 2023

rust-log-analyzer commented Mar 6, 2023

workingjubilee commented Mar 7, 2023

bors commented Mar 19, 2023

bors commented Apr 1, 2023

bors commented Apr 5, 2023

Dylan-DPC commented May 20, 2023

bors commented May 22, 2023

workingjubilee commented May 22, 2023

bors commented Jul 14, 2023

JohnCSimon commented Aug 27, 2023