From b9a43995bb632316aa3cc8aa20d544388a6c3cf2 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 08:55:36 -0500 Subject: [PATCH 1/9] Intergrate sonarcloud.io into workflow. Move analysis before Unit testing. --- .github/workflows/build.yml | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..5c5230727 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,47 @@ +name: Build +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + name: Build + runs-on: windows-latest + steps: + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 1.11 + - uses: actions/checkout@v2 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Cache SonarCloud packages + uses: actions/cache@v1 + with: + path: ~\sonar\cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache SonarCloud scanner + id: cache-sonar-scanner + uses: actions/cache@v1 + with: + path: .\.sonar\scanner + key: ${{ runner.os }}-sonar-scanner + restore-keys: ${{ runner.os }}-sonar-scanner + - name: Install SonarCloud scanner + if: steps.cache-sonar-scanner.outputs.cache-hit != 'true' + shell: powershell + run: | + New-Item -Path .\.sonar\scanner -ItemType Directory + dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + shell: powershell + run: | + .\.sonar\scanner\dotnet-sonarscanner begin /k:"Kareadita_Kavita" /o:"kareadita" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" + dotnet build --configuration Release --no-restore + .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" \ No newline at end of file From 1ca6f9b4eed0b125aa4cebf8fab324860f71a787 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:06:33 -0500 Subject: [PATCH 2/9] Github actions: trying to fix automated build and scan --- .github/workflows/dotnet-core.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 63933cf08..dedf78bfb 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -19,6 +19,9 @@ jobs: dotnet-version: 5.0.100 - name: Install dependencies run: dotnet restore + - name: Nuget Restore + - uses: nuget/setup-nuget@v1 + - run: nuget restore API.csproj - name: Set up JDK 11 uses: actions/setup-java@v1 From 980275e29db8c6d15855fd5146d16733770ea841 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:07:45 -0500 Subject: [PATCH 3/9] Github actions: trying to fix automated build and scan --- .github/workflows/build.yml | 2 +- .github/workflows/{dotnet-core.yml => dotnet-core.yml.backup} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{dotnet-core.yml => dotnet-core.yml.backup} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c5230727..b8ffa457a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ on: push: branches: - - master + - main pull_request: types: [opened, synchronize, reopened] jobs: diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml.backup similarity index 100% rename from .github/workflows/dotnet-core.yml rename to .github/workflows/dotnet-core.yml.backup From 8b4b31d748f556c39d0c240b3fa305219220c443 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:12:45 -0500 Subject: [PATCH 4/9] Github actions: trying to fix automated build and scan --- .github/workflows/build.yml | 47 ------------------- ...dotnet-core.yml.backup => dotnet-core.yml} | 3 +- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 .github/workflows/build.yml rename .github/workflows/{dotnet-core.yml.backup => dotnet-core.yml} (95%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index b8ffa457a..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Build -on: - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened] -jobs: - build: - name: Build - runs-on: windows-latest - steps: - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 1.11 - - uses: actions/checkout@v2 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Cache SonarCloud packages - uses: actions/cache@v1 - with: - path: ~\sonar\cache - key: ${{ runner.os }}-sonar - restore-keys: ${{ runner.os }}-sonar - - name: Cache SonarCloud scanner - id: cache-sonar-scanner - uses: actions/cache@v1 - with: - path: .\.sonar\scanner - key: ${{ runner.os }}-sonar-scanner - restore-keys: ${{ runner.os }}-sonar-scanner - - name: Install SonarCloud scanner - if: steps.cache-sonar-scanner.outputs.cache-hit != 'true' - shell: powershell - run: | - New-Item -Path .\.sonar\scanner -ItemType Directory - dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - - name: Build and analyze - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - shell: powershell - run: | - .\.sonar\scanner\dotnet-sonarscanner begin /k:"Kareadita_Kavita" /o:"kareadita" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" - dotnet build --configuration Release --no-restore - .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" \ No newline at end of file diff --git a/.github/workflows/dotnet-core.yml.backup b/.github/workflows/dotnet-core.yml similarity index 95% rename from .github/workflows/dotnet-core.yml.backup rename to .github/workflows/dotnet-core.yml index dedf78bfb..4499b636a 100644 --- a/.github/workflows/dotnet-core.yml.backup +++ b/.github/workflows/dotnet-core.yml @@ -21,7 +21,8 @@ jobs: run: dotnet restore - name: Nuget Restore - uses: nuget/setup-nuget@v1 - - run: nuget restore API.csproj + - run: nuget restore API/API.csproj + - run: nuget restore API.Tests/API.Tests.csproj - name: Set up JDK 11 uses: actions/setup-java@v1 From cfb409558b51234006752613303bf49f3423c014 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:13:34 -0500 Subject: [PATCH 5/9] Github actions: trying to fix automated build and scan --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 4499b636a..2475e7648 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -1,4 +1,4 @@ -name: .NET Core +name: Build on: push: From 93399dbd5d53849ce0b32fe319fc0b64af0e2548 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:14:40 -0500 Subject: [PATCH 6/9] Github actions: trying to fix automated build and scan --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 2475e7648..8e52c41f7 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -13,6 +13,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: nuget/setup-nuget@v1 - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: @@ -20,7 +21,6 @@ jobs: - name: Install dependencies run: dotnet restore - name: Nuget Restore - - uses: nuget/setup-nuget@v1 - run: nuget restore API/API.csproj - run: nuget restore API.Tests/API.Tests.csproj From 878c0c1e608db1acf21a6cff7ccd9a496ed1eb7f Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:15:36 -0500 Subject: [PATCH 7/9] Github actions: trying to fix automated build and scan --- .github/workflows/dotnet-core.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 8e52c41f7..2c83a84fd 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -13,17 +13,12 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: nuget/setup-nuget@v1 - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: dotnet-version: 5.0.100 - name: Install dependencies run: dotnet restore - - name: Nuget Restore - - run: nuget restore API/API.csproj - - run: nuget restore API.Tests/API.Tests.csproj - - name: Set up JDK 11 uses: actions/setup-java@v1 with: From 3a4b3646586fce6fb7408e67636b6f74d9ca350f Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:19:01 -0500 Subject: [PATCH 8/9] Github actions: trying to fix automated build and scan --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 2c83a84fd..25126124a 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -1,4 +1,4 @@ -name: Build +name: .NET Core Build on: push: From 128975a905a6602b5552c9134e17096d9d7fee68 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 14 Mar 2021 09:29:49 -0500 Subject: [PATCH 9/9] Github actions: trying to fix automated build and scan --- .github/workflows/dotnet-core.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 25126124a..298f4fbc2 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -10,9 +10,11 @@ on: jobs: build: name: Build - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: @@ -52,7 +54,7 @@ jobs: shell: powershell run: | .\.sonar\scanner\dotnet-sonarscanner begin /k:"Kareadita_Kavita" /o:"kareadita" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" - dotnet build --configuration Release --no-restore + dotnet build --configuration Release .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}" - name: Test run: dotnet test --no-restore --verbosity normal \ No newline at end of file