experiments/STT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update MSYS2 base archive and work around startup problem

Browse Source
This commit is contained in:
Alexandre Lissy 2020-05-19 18:05:07 +02:00 committed by Reuben Morais
parent 4ce7da717b
commit b6b2ec6d64
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
taskcluster/pyenv-win-opt-base.tyml
View File

@ -20,9 +20,9 @@ then:
mounts: mounts:
- file: msys2-base-x86_64.tar.xz - file: msys2-base-x86_64.tar.xz
content: content:
sha256: 4e799b5c3efcf9efcb84923656b7bcff16f75a666911abd6620ea8e5e1e9870c sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
url: >- url: >-
https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20180531.tar.xz/download https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
env: env:
TC_MSYS_VERSION: 'MSYS_NT-6.3' TC_MSYS_VERSION: 'MSYS_NT-6.3'
@ -32,7 +32,9 @@ then:
- >- - >-
"C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz | "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
"C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
- .\msys64\usr\bin\bash.exe --login -cx "exit" - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- $let: - $let:
taskIndexExpire: { $fromNow: '6 months' } taskIndexExpire: { $fromNow: '6 months' }
in: > in: >

8
taskcluster/test-win-cuda-opt-base.tyml
View File

@ -37,7 +37,9 @@ then:
- >- - >-
"C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz | "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
"C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
- .\msys64\usr\bin\bash.exe --login -cx "exit" - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- $let: - $let:
extraSystemSetup: { $eval: strip(str(build.system_setup)) } extraSystemSetup: { $eval: strip(str(build.system_setup)) }
in: > in: >
@ -65,9 +67,9 @@ then:
mounts: mounts:
- file: msys2-base-x86_64.tar.xz - file: msys2-base-x86_64.tar.xz
content: content:
sha256: 4e799b5c3efcf9efcb84923656b7bcff16f75a666911abd6620ea8e5e1e9870c sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
url: >- url: >-
https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20180531.tar.xz/download https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
- file: pyenv.tar.gz - file: pyenv.tar.gz
content: content:
url: ${system.pyenv.win.url} url: ${system.pyenv.win.url}

8
taskcluster/test-win-opt-base.tyml
View File

@ -39,7 +39,9 @@ then:
- >- - >-
"C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz | "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
"C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
- .\msys64\usr\bin\bash.exe --login -cx "exit" - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- $let: - $let:
extraSystemSetup: { $eval: strip(str(build.system_setup)) } extraSystemSetup: { $eval: strip(str(build.system_setup)) }
in: > in: >
@ -67,9 +69,9 @@ then:
mounts: mounts:
- file: msys2-base-x86_64.tar.xz - file: msys2-base-x86_64.tar.xz
content: content:
sha256: 4e799b5c3efcf9efcb84923656b7bcff16f75a666911abd6620ea8e5e1e9870c sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
url: >- url: >-
https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20180531.tar.xz/download https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
- file: pyenv.tar.gz - file: pyenv.tar.gz
content: content:
url: ${system.pyenv.win.url} url: ${system.pyenv.win.url}

8
taskcluster/win-opt-base.tyml
View File

@ -39,7 +39,9 @@ payload:
- >- - >-
"C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz | "C:\Program Files\7-zip\7z.exe" x -txz -so msys2-base-x86_64.tar.xz |
"C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si "C:\Program Files\7-zip\7z.exe" x -o%USERPROFILE% -ttar -aoa -si
- .\msys64\usr\bin\bash.exe --login -cx "exit" - .\msys64\usr\bin\bash.exe --login -cx "export THIS_BASH_PID=$$; ps -ef | grep '[?]' | awk '{print $2}' | grep -v $THIS_BASH_PID | xargs -r kill; exit 0"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- .\msys64\usr\bin\bash.exe --login -cx "pacman -Syu --noconfirm"
- echo .\msys64\usr\bin\bash.exe --login -cxe " - echo .\msys64\usr\bin\bash.exe --login -cxe "
export LC_ALL=C && export LC_ALL=C &&
export PATH=\"/c/builds/tc-workdir/msys64/usr/bin:/c/Python36:/c/Program Files/Git/bin:/c/Program Files/7-Zip/:$PATH\" && export PATH=\"/c/builds/tc-workdir/msys64/usr/bin:/c/Python36:/c/Program Files/Git/bin:/c/Program Files/7-Zip/:$PATH\" &&
@ -71,9 +73,9 @@ payload:
mounts: mounts:
- file: msys2-base-x86_64.tar.xz - file: msys2-base-x86_64.tar.xz
content: content:
sha256: 4e799b5c3efcf9efcb84923656b7bcff16f75a666911abd6620ea8e5e1e9870c sha256: c4443113497acb2d2e285d40b929fc55f33f8f669902595ecdf66a655b63dc60
url: >- url: >-
https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20180531.tar.xz/download https://github.com/msys2/msys2-installer/releases/download/2020-05-17/msys2-base-x86_64-20200517.tar.xz
- file: home.tar.xz - file: home.tar.xz
content: content:
url: ${build.tensorflow} url: ${build.tensorflow}