From 3397ead4284b907f89ec63202cbe988a8e761c52 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 11:49:55 +0200 Subject: [PATCH 1/9] enable feature and bugfix branch --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82bd2135..f2e4cfa2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,8 @@ on: push: branches: - main + - feature/** + - bugfix/** pull_request: types: [opened, synchronize, reopened] jobs: From 7886cd8a4fc10c0fc4448bd5304733ed08e37586 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 12:35:16 +0200 Subject: [PATCH 2/9] download and run db* CODECOP CLI --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2e4cfa2..37fb9299 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,12 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: download db* CODECOP + run: | + export COP_VERSION=4.3.0 + wget https://github.com/Trivadis/plsql-cop-cli/releases/download/v$COP_VERSION/tvdcc-$COP_VERSION.zip + unzip tvdcc-$COP_VERSION.zip -d . + tvdcc-$COP_VERSION/tvdcc.sh path=doc skip=none - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: From 782ebfccccbb896f2f99218cec4650998e809db7 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 12:38:21 +0200 Subject: [PATCH 3/9] fix indentation --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37fb9299..f944b72a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,11 +16,11 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: download db* CODECOP - run: | - export COP_VERSION=4.3.0 - wget https://github.com/Trivadis/plsql-cop-cli/releases/download/v$COP_VERSION/tvdcc-$COP_VERSION.zip - unzip tvdcc-$COP_VERSION.zip -d . - tvdcc-$COP_VERSION/tvdcc.sh path=doc skip=none + run: | + export COP_VERSION=4.3.0 + wget https://github.com/Trivadis/plsql-cop-cli/releases/download/v$COP_VERSION/tvdcc-$COP_VERSION.zip + unzip tvdcc-$COP_VERSION.zip -d . + tvdcc-$COP_VERSION/tvdcc.sh path=doc skip=none - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: From be3120a82927df9e054e1869738e4205d825535b Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 12:41:20 +0200 Subject: [PATCH 4/9] fix analysis directory --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f944b72a..bf32a5e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: export COP_VERSION=4.3.0 wget https://github.com/Trivadis/plsql-cop-cli/releases/download/v$COP_VERSION/tvdcc-$COP_VERSION.zip unzip tvdcc-$COP_VERSION.zip -d . - tvdcc-$COP_VERSION/tvdcc.sh path=doc skip=none + tvdcc-$COP_VERSION/tvdcc.sh path=docs skip=none - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: From 71479b21817188d79f8f03b42106fb2fd9d8c2a2 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 13:03:56 +0200 Subject: [PATCH 5/9] use base64 encoded secret for tvdcc license --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf32a5e2..98247064 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,12 +15,15 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: download db* CODECOP + - name: db* CODECOP run: | export COP_VERSION=4.3.0 wget https://github.com/Trivadis/plsql-cop-cli/releases/download/v$COP_VERSION/tvdcc-$COP_VERSION.zip unzip tvdcc-$COP_VERSION.zip -d . + echo $TVDCC_LIC | base64 -d > tvdcc-$COP_VERSION/tvdcc.lic tvdcc-$COP_VERSION/tvdcc.sh path=docs skip=none + env: + TVDCC_LIC: ${{ secrets.TVDCC_LIC }} - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: From cecbba99dbd73d67852bbbb204231def7fa9da62 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 13:32:25 +0200 Subject: [PATCH 6/9] configure custom validator --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98247064..ca09d636 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,11 +17,13 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: db* CODECOP run: | - export COP_VERSION=4.3.0 - wget https://github.com/Trivadis/plsql-cop-cli/releases/download/v$COP_VERSION/tvdcc-$COP_VERSION.zip - unzip tvdcc-$COP_VERSION.zip -d . - echo $TVDCC_LIC | base64 -d > tvdcc-$COP_VERSION/tvdcc.lic - tvdcc-$COP_VERSION/tvdcc.sh path=docs skip=none + export COP=4.3.0 + export VALIDATOR=4.3.0 + wget https://github.com/Trivadis/plsql-cop-cli/releases/download/v$COP/tvdcc-$COP.zip + unzip tvdcc-$COP.zip -d . + wget -P tvdcc-$COP/plugin/ https://github.com/Trivadis/plsql-cop-validators/releases/download/v$VALIDATOR/sonar-plsql-cop-custom-validators-plugin-$VALIDATOR.jar + echo $TVDCC_LIC | base64 -d > tvdcc-$COP/tvdcc.lic + tvdcc-$COP/tvdcc.sh path=docs skip=none validator=com.trivadis.tvdcc.validators.TrivadisGuidelines3Plus env: TVDCC_LIC: ${{ secrets.TVDCC_LIC }} - name: SonarCloud Scan From c5011cfe221187bd7936e4a8fd0d13da3c4370ef Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 13:40:13 +0200 Subject: [PATCH 7/9] configure external issues report (JSON) --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index a6d54d1b..b5677b35 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -15,7 +15,7 @@ sonar.sources=docs #sonar.sourceEncoding=UTF-8 # File in Genric Issue Import Format produced by db* CODECOP CLI -#sonar.externalIssuesReportPaths=tvdcc_report.json +sonar.externalIssuesReportPaths=tvdcc_report.json # Change the default list of suffixes for the SonarPLSQL plugin in https://sonarcloud.io sonar.plsql.file.suffixes=md From 8f1ef12436c15c9110ced93d0a586f560bb2afd0 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 13:42:34 +0200 Subject: [PATCH 8/9] rename step --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca09d636..aaafa815 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: db* CODECOP + - name: db* CODECOP Issues run: | export COP=4.3.0 export VALIDATOR=4.3.0 From b5c75ca3710566763b01894837355d41ca8d33cc Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 3 Sep 2022 13:50:32 +0200 Subject: [PATCH 9/9] do not create html and excel file --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aaafa815..91ab4783 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: unzip tvdcc-$COP.zip -d . wget -P tvdcc-$COP/plugin/ https://github.com/Trivadis/plsql-cop-validators/releases/download/v$VALIDATOR/sonar-plsql-cop-custom-validators-plugin-$VALIDATOR.jar echo $TVDCC_LIC | base64 -d > tvdcc-$COP/tvdcc.lic - tvdcc-$COP/tvdcc.sh path=docs skip=none validator=com.trivadis.tvdcc.validators.TrivadisGuidelines3Plus + tvdcc-$COP/tvdcc.sh path=docs skip=none html=false excel=false validator=com.trivadis.tvdcc.validators.TrivadisGuidelines3Plus env: TVDCC_LIC: ${{ secrets.TVDCC_LIC }} - name: SonarCloud Scan