Skip to content

Commit e7409d3

Browse files
committed
Trying to trigger
2 parents a35f150 + 2e795fb commit e7409d3

File tree

2 files changed

+388
-4
lines changed

2 files changed

+388
-4
lines changed

.github/workflows/sonarqube.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
name: Build
1+
name: SonarQube
22
on:
33
push:
44
branches:
55
- dsier/sonarqube
6-
pull_request:
7-
types: [opened, synchronize, reopened]
86
jobs:
97
build:
108
name: Build
@@ -43,5 +41,10 @@ jobs:
4341
shell: powershell
4442
run: |
4543
.\.sonar\scanner\dotnet-sonarscanner begin /k:"csharpsdk" /o:"optidevx" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
44+
<<<<<<< HEAD
4645
dotnet build OptimizelySDK.NetStandard20/OptimizelySDK.NetStandard20.csproj /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=D:\a\csharp-sdk\csharp-sdk\keypair.snk -c Release
47-
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
46+
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
47+
=======
48+
dotnet build .\OptimizelySDK\
49+
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
50+
>>>>>>> master

0 commit comments

Comments
 (0)