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

Use preinstalled msys2 #73188

Merged
merged 1 commit into from
Jun 14, 2020
Merged

Conversation

mati865
Copy link
Contributor

@mati865 mati865 commented Jun 9, 2020

Fixes #65767

@mati865 mati865 marked this pull request as draft June 9, 2020 22:57
@rust-highfive
Copy link
Collaborator

The job x86_64-mingw-1 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
##[section]Starting: Windows x86_64-mingw-1
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 4'
Agent machine name: 'fv-az363'
Current agent version: '2.170.1'
##[group]Operating System
10.0.14393
Datacenter
Datacenter
##[endgroup]
##[group]Virtual Environment
Environment: windows-2016
Version: 20200531.1
Included Software: https://github.com/actions/virtual-environments/blob/win16/20200531.1/images/win/Windows2016-Readme.md
##[endgroup]
Agent running as: 'VssAdministrator'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.3)
Checking job knob settings.
   Knob: AgentToolsDirectory = C:/hostedtoolcache/windows Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = c:\vsts\perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/e9b3ccd2-ab36-416c-a8a6-c247f7fd54ac.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73188/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73188/merge:refs/remotes/pull/73188/merge
---
configure: 
configure: run `python D:\a\1\s/x.py --help`
configure: 
Attempting with retry: make prepare
      1 [main] make (2824) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 2/5:
      0 [main] make (1200) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 3/5:
      0 [main] make (4700) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 4/5:
      0 [main] make (4748) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 5/5:
      0 [main] make (820) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
The command has failed after 5 attempts.
== clock drift check ==
  local time: Tue Jun  9 23:00:33 CUT 2020
  network time: Tue, 09 Jun 2020 23:00:33 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/73188/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/73188/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (4068) (python)
Terminate orphan process: pid (1736) (sccache)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@rust-highfive
Copy link
Collaborator

The job x86_64-mingw-1 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
##[section]Starting: Windows x86_64-mingw-1
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 2'
Agent machine name: 'fv-az425'
Current agent version: '2.170.1'
##[group]Operating System
10.0.14393
Datacenter
Datacenter
##[endgroup]
##[group]Virtual Environment
Environment: windows-2016
Version: 20200531.1
Included Software: https://github.com/actions/virtual-environments/blob/win16/20200531.1/images/win/Windows2016-Readme.md
##[endgroup]
Agent running as: 'VssAdministrator'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.3)
Checking job knob settings.
   Knob: AgentToolsDirectory = C:/hostedtoolcache/windows Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = c:\vsts\perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/d888ca66-b87d-45dc-a87e-f473ae90710e.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73188/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73188/merge:refs/remotes/pull/73188/merge
---
configure: 
configure: run `python D:\a\1\s/x.py --help`
configure: 
Attempting with retry: make prepare
      1 [main] make (3968) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 2/5:
      0 [main] make (2332) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 3/5:
      0 [main] make (3116) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 4/5:
      0 [main] make (5508) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
Command failed. Attempt 5/5:
      1 [main] make (4320) C:\msys64\usr\bin\make.exe: *** fatal error - cygheap base mismatch detected - 0x180317408/0x18033E408.
Search for cygwin1.dll using the Windows Start->Find/Search facility
and delete all but the most recent version.  The most recent version *should*
reside in x:\cygwin\bin, where 'x' is the drive on which you have
installed the cygwin distribution.  Rebooting is also suggested if you
installed the cygwin distribution.  Rebooting is also suggested if you
are unable to find another cygwin DLL.
The command has failed after 5 attempts.
== clock drift check ==
  local time: Tue Jun  9 23:05:47 CUT 2020
  network time: Tue, 09 Jun 2020 23:05:47 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/73188/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/73188/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3876) (python)
Terminate orphan process: pid (5988) (sccache)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
##[section]Starting: Windows x86_64-mingw-1
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 8'
Agent machine name: 'fv-az172'
Current agent version: '2.170.1'
##[group]Operating System
10.0.14393
Datacenter
Datacenter
##[endgroup]
##[group]Virtual Environment
Environment: windows-2016
Version: 20200531.1
Included Software: https://github.com/actions/virtual-environments/blob/win16/20200531.1/images/win/Windows2016-Readme.md
##[endgroup]
Agent running as: 'VssAdministrator'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.3)
Checking job knob settings.
   Knob: AgentToolsDirectory = C:/hostedtoolcache/windows Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = c:\vsts\perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/91565528-0e72-4930-a2fb-77588821d000.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73188/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73188/merge:refs/remotes/pull/73188/merge

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@mati865 mati865 force-pushed the use-preinstalled-msys2 branch 2 times, most recently from b144e73 to 3adc94f Compare June 10, 2020 09:25
@mati865 mati865 marked this pull request as ready for review June 10, 2020 09:25
@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
##[section]Starting: Linux mingw-check
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 5'
Agent machine name: 'fv-az578'
Current agent version: '2.170.1'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200604.1
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200604.1/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.3)
Checking job knob settings.
   Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/c4edaf9c-fb3a-471e-9b7e-32fb9e928453.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73188/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73188/merge:refs/remotes/pull/73188/merge

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@mati865
Copy link
Contributor Author

mati865 commented Jun 11, 2020

BTW there is bug when running ./x.py run src/tools/expand-yaml-anchors on Windows:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 355f2829215..2d62df39459 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@
 # This file was automatically generated by the expand-yaml-anchors tool. The
 # source file that generated this one is:
 #
-#   src/ci/github-actions/ci.yml
+#   src/ci/github-actions\ci.yml
 #
 # Once you make changes to that file you need to run:
 #

@pietroalbini
Copy link
Member

This looks good now! Thanks!

@bors r+ rollup=never

BTW there is bug when running ./x.py run src/tools/expand-yaml-anchors on Windows:

Oh that's bad, do you have the time to open a PR fixing that?

@bors
Copy link
Contributor

bors commented Jun 11, 2020

📌 Commit 91b6f15 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 11, 2020
@mati865
Copy link
Contributor Author

mati865 commented Jun 11, 2020

Oh that's bad, do you have the time to open a PR fixing that?

I'll look into expand-yaml-anchors code and open PR or issue depending on how long it takes to fix 😄

@pietroalbini
Copy link
Member

I'll look into expand-yaml-anchors code and open PR or issue depending on how long it takes to fix

I'm happy to mentor: if you need any help feel free to ping me wherever.

@mati865
Copy link
Contributor Author

mati865 commented Jun 11, 2020

Damn, I think I saw open issue about it but there are dozens of them when searching for path label:O-windows:

use std::path::Path;

fn main() {
    let path = Path::new("/tmp/foo").join("bar.rs");
    println!("{}", path.display());
}

This gives:

$ rustc test.rs && ./test.exe
/tmp/foo\bar.rs

@Dylan-DPC-zz
Copy link

@bors p=1

@bors
Copy link
Contributor

bors commented Jun 14, 2020

⌛ Testing commit 91b6f15 with merge d3d3a14...

@bors
Copy link
Contributor

bors commented Jun 14, 2020

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing d3d3a14 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 14, 2020
@bors bors merged commit d3d3a14 into rust-lang:master Jun 14, 2020
@mati865 mati865 deleted the use-preinstalled-msys2 branch July 25, 2020 16:28
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove msys2 hacks and vendor the whole thing
6 participants