1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 20:29:57 +00:00

Revert "Time commands"

This reverts commit c132646b97.
This commit is contained in:
AnyOldName3 2020-07-13 16:53:23 +01:00
parent c132646b97
commit 6a8e736bd2

View file

@ -50,34 +50,30 @@ MacOS:
tags: tags:
- windows - windows
before_script: before_script:
- Get-Date -Format "HH:mm:ss" - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
- Measure-Command -Expression { Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" | Out-Default } - choco install git --force --params "/GitAndUnixToolsOnPath" -y
- Measure-Command -Expression { choco install git --force --params "/GitAndUnixToolsOnPath" -y | Out-Default } - choco install 7zip -y
- Measure-Command -Expression { choco install 7zip -y | Out-Default } - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
- Measure-Command -Expression { choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y | Out-Default } - choco install vswhere -y
- Measure-Command -Expression { choco install vswhere -y | Out-Default } - choco install ninja -y
- Measure-Command -Expression { choco install ninja -y | Out-Default } - choco install python -y
- Measure-Command -Expression { choco install python -y | Out-Default } - refreshenv
- Measure-Command -Expression { refreshenv | Out-Default }
- Get-Date -Format "HH:mm:ss"
stage: build stage: build
script: script:
- Get-Date -Format "HH:mm:ss" - $time = (Get-Date -Format "HH:mm:ss")
- Measure-Command -Expression { $time = (Get-Date -Format "HH:mm:ss") | Out-Default } - echo ${time}
- Measure-Command -Expression { echo ${time} | Out-Default } - echo "started by ${GITLAB_USER_NAME}"
- Measure-Command -Expression { echo "started by ${GITLAB_USER_NAME}" | Out-Default } - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N
- Measure-Command -Expression { sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -N | Out-Default } - cd MSVC2019_64_Ninja
- Measure-Command -Expression { cd MSVC2019_64_Ninja | Out-Default } - .\ActivateMSVC.ps1
- Measure-Command -Expression { .\ActivateMSVC.ps1 | Out-Default } - cmake --build . --config $config
- Measure-Command -Expression { cmake --build . --config $config | Out-Default } - cd $config
- Measure-Command -Expression { cd $config | Out-Default }
- | - |
if (Get-ChildItem -Recurse *.pdb) { if (Get-ChildItem -Recurse *.pdb) {
Measure-Command -Expression { 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb' | Out-Default } 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb'
Measure-Command -Expression { Get-ChildItem -Recurse *.pdb | Remove-Item | Out-Default } Get-ChildItem -Recurse *.pdb | Remove-Item
} }
- Measure-Command -Expression { 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.zip '*' | Out-Default } - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.zip '*'
- Get-Date -Format "HH:mm:ss"
cache: cache:
key: ninja-v2 key: ninja-v2
paths: paths:
@ -119,32 +115,28 @@ Windows_Ninja_RelWithDebInfo:
tags: tags:
- windows - windows
before_script: before_script:
- Get-Date -Format "HH:mm:ss" - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
- Measure-Command -Expression { Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" | Out-Default } - choco install git --force --params "/GitAndUnixToolsOnPath" -y
- Measure-Command -Expression { choco install git --force --params "/GitAndUnixToolsOnPath" -y | Out-Default } - choco install 7zip -y
- Measure-Command -Expression { choco install 7zip -y | Out-Default } - choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y
- Measure-Command -Expression { choco install cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' -y | Out-Default } - choco install vswhere -y
- Measure-Command -Expression { choco install vswhere -y | Out-Default } - choco install python -y
- Measure-Command -Expression { choco install python -y | Out-Default } - refreshenv
- Measure-Command -Expression { refreshenv | Out-Default }
- Get-Date -Format "HH:mm:ss"
stage: build stage: build
script: script:
- Get-Date -Format "HH:mm:ss" - $time = (Get-Date -Format "HH:mm:ss")
- Measure-Command -Expression { $time = (Get-Date -Format "HH:mm:ss") | Out-Default } - echo ${time}
- Measure-Command -Expression { echo ${time} | Out-Default } - echo "started by ${GITLAB_USER_NAME}"
- Measure-Command -Expression { echo "started by ${GITLAB_USER_NAME}" | Out-Default } - sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V
- Measure-Command -Expression { sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V | Out-Default } - cd MSVC2019_64
- Measure-Command -Expression { cd MSVC2019_64 | Out-Default } - cmake --build . --config $config
- Measure-Command -Expression { cmake --build . --config $config | Out-Default } - cd $config
- Measure-Command -Expression { cd $config | Out-Default }
- | - |
if (Get-ChildItem -Recurse *.pdb) { if (Get-ChildItem -Recurse *.pdb) {
Measure-Command -Expression { 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb' | Out-Default } 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}_symbols.zip '*.pdb'
Measure-Command -Expression { Get-ChildItem -Recurse *.pdb | Remove-Item | Out-Default } Get-ChildItem -Recurse *.pdb | Remove-Item
} }
- Measure-Command -Expression { 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.zip '*' | Out-Default } - 7z a -tzip ..\..\OpenMW_MSVC2019_64_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.zip '*'
- Get-Date -Format "HH:mm:ss"
cache: cache:
key: msbuild-v2 key: msbuild-v2
paths: paths: