GitLab CI: Switch to single line commands.

This commit is contained in:
Gerald Combs 2021-04-29 17:36:52 -07:00
parent 2cad09e89b
commit 3bcdd863b1
1 changed files with 5 additions and 32 deletions

View File

@ -420,25 +420,14 @@ coverity-gcc:
CFLAGS: '-DGLIB_DISABLE_DEPRECATION_WARNINGS'
CXXFLAGS: '-DGLIB_DISABLE_DEPRECATION_WARNINGS'
script:
- >
curl
--output /tmp/cov-analysis-linux64.tar.gz
--form project=$COVERITY_SCAN_PROJECT_NAME
--form token=$COVERITY_SCAN_TOKEN
https://scan.coverity.com/download/linux64
- curl --output /tmp/cov-analysis-linux64.tar.gz --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN https://scan.coverity.com/download/linux64
- tar --directory=/tmp --extract --gzip --file /tmp/cov-analysis-linux64.tar.gz
- mkdir build
- cd build
- cmake -G Ninja ..
- /tmp/cov-analysis-linux64-*/bin/cov-build --return-emit-failures --dir cov-int ninja
- tar --create --gzip --file cov-int.tar.gz cov-int
- >
curl
--form file=@cov-int.tar.gz
--form token=$COVERITY_SCAN_TOKEN
--form email=$GITLAB_USER_EMAIL
--form description="Ubuntu $( git describe --tags ) $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
--form version=$( git describe --tags )
- curl --form file=@cov-int.tar.gz --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL --form description="Ubuntu $( git describe --tags ) $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" --form version=$( git describe --tags )
coverity-visual-c++:
only:
@ -451,27 +440,11 @@ coverity-visual-c++:
needs: []
script:
- $gitDescription = (( git describe --tags ) | Out-String).Trim()
- >
C:\ProgramData\chocolatey\bin\curl
--output $env:temp\cov-analysis-win64.zip
--form project=$COVERITY_SCAN_PROJECT_NAME
--form token=$COVERITY_SCAN_TOKEN
https://scan.coverity.com/download/win64
- C:\ProgramData\chocolatey\bin\curl --output $env:temp\cov-analysis-win64.zip --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN https://scan.coverity.com/download/win64
- C:\ProgramData\chocolatey\tools\7z x "$env:temp\cov-analysis-win64.zip" -y -r -o"$env:temp"
- cmake -DTEST_EXTRA_ARGS=--enable-release -DENABLE_LTO=off -G "Visual Studio 16 2019" -A x64 ..
- $covAnalysisWin64 = (Get-ChildItem -Path $env:temp -Filter "cov-analysis-win64-*" -Directory)[0].FullName
- >
Invoke-Expression "& $covAnalysisWin64\bin\cov-build.exe
--return-emit-failures
--dir cov-int
msbuild /verbosity:minimal `"/consoleloggerparameters:PerformanceSummary;NoSummary`" /maxcpucount:1 Wireshark.sln"
- Invoke-Expression "& $covAnalysisWin64\bin\cov-build.exe --return-emit-failures --dir cov-int msbuild /verbosity:minimal `"/consoleloggerparameters:PerformanceSummary;NoSummary`" /maxcpucount:1 Wireshark.sln"
- Set-Location ..\cov-build
- C:\ProgramData\chocolatey\tools\7z a -tzip cov-int.zip cov-int
- >
C:\ProgramData\chocolatey\bin\curl
--form file=@cov-int.zip
--form token=$COVERITY_SCAN_TOKEN
--form email=$GITLAB_USER_EMAIL
--form description="Windows $gitDescription $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
--form version=$gitDescription
https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
- C:\ProgramData\chocolatey\bin\curl --form file=@cov-int.zip --form token=$COVERITY_SCAN_TOKEN--form email=$GITLAB_USER_EMAIL --form description="Windows $gitDescription $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" --form version=$gitDescription https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME