From 2c21bf54c7a43efa38ecc30d96a5f51a24f5a70a Mon Sep 17 00:00:00 2001 From: Mathieu Suen Date: Fri, 13 Aug 2021 15:19:40 +0200 Subject: [PATCH] SONAR-15106 Make Azure Tutorial more generic for cfamily. --- .../tutorials/azure-pipelines/commands/ClangGCC.tsx | 7 +++---- .../__tests__/__snapshots__/ClangGCC-test.tsx.snap | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx index 41b5e9bdf97..d0b7783818c 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx @@ -55,7 +55,7 @@ unzip build-wrapper.zip`, highlightScriptKey: 'onboarding.tutorial.with.azure_pipelines.BranchAnalysis.build_wrapper.ccpp.nix', scriptBuild: - './build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make clean all' + './build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output ' }, [OSs.Windows]: { script: `Invoke-WebRequest -Uri '${host}/static/cpp/build-wrapper-win-x86.zip' -OutFile 'build-wrapper.zip' @@ -63,7 +63,7 @@ Expand-Archive -Path 'build-wrapper.zip' -DestinationPath '.'`, highlightScriptKey: 'onboarding.tutorial.with.azure_pipelines.BranchAnalysis.build_wrapper.ccpp.win', scriptBuild: - 'build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir bw-output MSBuild.exe /t:Rebuild' + 'build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir bw-output ' }, [OSs.MacOS]: { script: `curl '${host}/static/cpp/build-wrapper-macosx-x86.zip' --output build-wrapper.zip @@ -71,8 +71,7 @@ unzip build-wrapper.zip`, highlightScriptKey: 'onboarding.tutorial.with.azure_pipelines.BranchAnalysis.build_wrapper.ccpp.nix', scriptBuild: - './build-wrapper-macos-x86/build-wrapper-macos-x86 --out-dir bw-output xcodebuild' + - ' -project myproject.xcodeproj -configuration Release clean build' + './build-wrapper-macos-x86/build-wrapper-macos-x86 --out-dir bw-output ' } }; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap index 09b4ed03122..88c2a0fd284 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap @@ -95,7 +95,7 @@ unzip build-wrapper.zip" translationKey="onboarding.tutorial.with.azure_pipelines.BranchAnalysis.build_script.ccpp" /> @@ -212,7 +212,7 @@ unzip build-wrapper.zip" translationKey="onboarding.tutorial.with.azure_pipelines.BranchAnalysis.build_script.ccpp" /> @@ -329,7 +329,7 @@ Expand-Archive -Path 'build-wrapper.zip' -DestinationPath '.'" translationKey="onboarding.tutorial.with.azure_pipelines.BranchAnalysis.build_script.ccpp" /> -- 2.39.5