Update remaining spots in actions to update SONAR var settings

DynamicsValue · Feb 4, 2024 · 3852754 · 3852754
1 parent 169caa7
commit 3852754
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/CI-2x.yml b/.github/workflows/CI-2x.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build
       run: pwsh ./build.ps1 -configuration ${{matrix.configuration}} -targetFrameworks 'all'
       env: 
-        NUGET_USERNAME: DynamicsValue
+        NUGET_USERNAME: ${{github.repository_owner}}
         NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }} 
 
   sonar:
@@ -87,11 +87,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }} 
         shell: powershell
         run: |
-          .\.sonar\scanner\dotnet-sonarscanner begin /k:"DynamicsValue_fake-xrm-easy-core" /o:"dynamicsvalue" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.verbose="true" /d:sonar.qualitygate.wait="true" /d:sonar.cs.opencover.reportsPaths="coverage/**/coverage.opencover.xml" /d:sonar.coverage.exclusions="tests/**/**"
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"${{ vars.SONAR_PROJECT_PREFIX }}_fake-xrm-easy-core" /o:"${{ vars.SONAR_ORG_NAME }}" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.verbose="true" /d:sonar.qualitygate.wait="true" /d:sonar.cs.opencover.reportsPaths="coverage/**/coverage.opencover.xml" /d:sonar.coverage.exclusions="tests/**/**"
           .\build.ps1 -configuration FAKE_XRM_EASY_9 -targetFrameworks 'all'
           .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
 
@@ -116,32 +116,32 @@ jobs:
       - name: Build
         run: pwsh ./build.ps1 -targetFrameworks 'all'
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Pack Src
         run: pwsh ./pack-src.ps1 -targetFrameworks 'all' -versionSuffix "zci.${{ github.head_ref }}${{ github.run_number }}"
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Push Src
         run: nuget.exe push .\nupkgs\FakeXrmEasy.Core.*.nupkg -Source ${{ env.source-url }}
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_AUTH_TOKEN: ${{ github.token }}
           NUGET_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Pack Tests
         run: pwsh ./pack-tests.ps1 -targetFrameworks 'all' -versionSuffix "zci.${{ github.head_ref }}${{ github.run_number }}"
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Push Tests
         run: nuget.exe push .\nupkgs\FakeXrmEasy.CoreTests.*.nupkg -Source ${{ env.source-url }}
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_AUTH_TOKEN: ${{ github.token }}
           NUGET_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/CI-3x.yml b/.github/workflows/CI-3x.yml
@@ -66,7 +66,7 @@ jobs:
     - name: Build
       run: pwsh ./build.ps1 -configuration ${{matrix.configuration}} -targetFrameworks 'all'
       env: 
-        NUGET_USERNAME: DynamicsValue
+        NUGET_USERNAME: ${{github.repository_owner}}
         NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }} 
 
   sonar:
@@ -94,7 +94,7 @@ jobs:
         testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
         projectKey: ${{ secrets.SONAR_PROJECT_KEY }}
         projectName: fake-xrm-easy-core
-        sonarOrganisation: dynamicsvalue
+        sonarOrganisation: ${{ vars.SONAR_ORG_NAME }}
         beginArguments: >
             /d:sonar.verbose="true"
             /d:sonar.qualitygate.wait="true"
@@ -103,7 +103,7 @@ jobs:
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
-        NUGET_USERNAME: DynamicsValue
+        NUGET_USERNAME: ${{github.repository_owner}}
         NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }} 
 
   pack-push:
@@ -127,32 +127,32 @@ jobs:
       - name: Build
         run: pwsh ./build.ps1 -targetFrameworks 'all'
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Pack Src
         run: pwsh ./pack-src.ps1 -targetFrameworks 'all' -versionSuffix "zci.${{ github.head_ref }}${{ github.run_number }}"
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Push Src
         run: nuget.exe push .\nupkgs\FakeXrmEasy.Core.*.nupkg -Source ${{ env.source-url }}
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_AUTH_TOKEN: ${{ github.token }}
           NUGET_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Pack Tests
         run: pwsh ./pack-tests.ps1 -targetFrameworks 'all' -versionSuffix "zci.${{ github.head_ref }}${{ github.run_number }}"
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Push Tests
         run: nuget.exe push .\nupkgs\FakeXrmEasy.CoreTests.*.nupkg -Source ${{ env.source-url }}
         env: 
-          NUGET_USERNAME: DynamicsValue
+          NUGET_USERNAME: ${{github.repository_owner}}
           NUGET_AUTH_TOKEN: ${{ github.token }}
           NUGET_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/CI-PullRequest-3x.yml b/.github/workflows/CI-PullRequest-3x.yml
@@ -94,7 +94,7 @@ jobs:
         testCommand: dotnet test . --configuration 'FAKE_XRM_EASY_9' --framework netcoreapp3.1 --verbosity normal --collect:"XPlat code coverage" --settings tests/.runsettings --results-directory ./coverage
         projectKey: ${{ secrets.SONAR_PROJECT_KEY }}
         projectName: fake-xrm-easy-core
-        sonarOrganisation: dynamicsvalue
+        sonarOrganisation: ${{ vars.SONAR_ORG_NAME }}
         beginArguments: >
             /d:sonar.verbose="true"
             /d:sonar.qualitygate.wait="true"