diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-04-29 17:36:52 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2021-04-29 17:37:32 -0700 |
| commit | 3bcdd863b1b74970a08fa30427c0dc3c791b4682 (patch) | |
| tree | b248649fdd31a8e451b4873a8adc74b0df47398b | |
| parent | 2cad09e89bff0c93c1e4c3f6311d6e1ea2775bdf (diff) | |
GitLab CI: Switch to single line commands.
| -rw-r--r-- | .gitlab-ci.yml | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 851d105db4..6afe0047f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 |