From 5e89bde05b32386fc89b1dab7ec239283239297e Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 16:35:05 +0100 Subject: [PATCH 01/12] Add qodana. --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8567d2a9f0..f0e7f94f67 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,13 +1,18 @@ name: Sonarcloud CI on: + workflow_dispatch: push: branches: - main - develop - - 5.8-dev pull_request: types: [opened, synchronize, reopened] jobs: + qodana: + name: 'Qodana Scan' + uses: JetBrains/qodana-action@main + env: + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} sonarcloud: name: SonarCloud runs-on: ubuntu-latest From bcb1fce7edc188bb2dc3e0499ffd30e5fc7cfbb9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 16:37:38 +0100 Subject: [PATCH 02/12] Add new jpbs --- .github/workflows/build.yml | 11 ----------- .github/workflows/qodana.yaml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/qodana.yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0e7f94f67..688d81a50f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,18 +1,7 @@ name: Sonarcloud CI on: workflow_dispatch: - push: - branches: - - main - - develop - pull_request: - types: [opened, synchronize, reopened] jobs: - qodana: - name: 'Qodana Scan' - uses: JetBrains/qodana-action@main - env: - QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} sonarcloud: name: SonarCloud runs-on: ubuntu-latest diff --git a/.github/workflows/qodana.yaml b/.github/workflows/qodana.yaml new file mode 100644 index 0000000000..7f9ccdc2a5 --- /dev/null +++ b/.github/workflows/qodana.yaml @@ -0,0 +1,15 @@ +name: Qodana +on: + workflow_dispatch: + push: + branches: + - main + - develop + pull_request: + types: [opened, synchronize, reopened] +jobs: + qodana: + name: 'Qodana Scan' + uses: JetBrains/qodana-action@main + env: + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} From 38bff09c1d36b3aaabd9a782b18f5eedda43a9c3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 16:42:53 +0100 Subject: [PATCH 03/12] Add actual step. --- .github/workflows/build.yml | 2 +- .github/workflows/qodana.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 688d81a50f..3171afaf2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,4 +13,4 @@ jobs: uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/qodana.yaml b/.github/workflows/qodana.yaml index 7f9ccdc2a5..4e4252eaf9 100644 --- a/.github/workflows/qodana.yaml +++ b/.github/workflows/qodana.yaml @@ -13,3 +13,8 @@ jobs: uses: JetBrains/qodana-action@main env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} + steps: + - name: 'Qodana Scan' + uses: JetBrains/qodana-action@main + env: + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} \ No newline at end of file From 08f9da8a15343ee213018ee252b2f236a29be7ad Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 16:46:07 +0100 Subject: [PATCH 04/12] Rename and cleanup file. --- .github/workflows/{qodana.yaml => qodana.yml} | 3 --- 1 file changed, 3 deletions(-) rename .github/workflows/{qodana.yaml => qodana.yml} (77%) diff --git a/.github/workflows/qodana.yaml b/.github/workflows/qodana.yml similarity index 77% rename from .github/workflows/qodana.yaml rename to .github/workflows/qodana.yml index 4e4252eaf9..8e769b087e 100644 --- a/.github/workflows/qodana.yaml +++ b/.github/workflows/qodana.yml @@ -10,9 +10,6 @@ on: jobs: qodana: name: 'Qodana Scan' - uses: JetBrains/qodana-action@main - env: - QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} steps: - name: 'Qodana Scan' uses: JetBrains/qodana-action@main From e4b4234fbb716a3e92c5c0c40bc42909243b8d09 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 16:47:55 +0100 Subject: [PATCH 05/12] Update qodana.yml Signed-off-by: James Cole --- .github/workflows/qodana.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 8e769b087e..eb1fc9b9bd 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -9,9 +9,10 @@ on: types: [opened, synchronize, reopened] jobs: qodana: + runs-on: ubuntu-latest name: 'Qodana Scan' steps: - name: 'Qodana Scan' uses: JetBrains/qodana-action@main env: - QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} \ No newline at end of file + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} From df0a6db83f802fd27aa2854b44e6f4047d8322cc Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 16:51:36 +0100 Subject: [PATCH 06/12] Create qodana.yml Signed-off-by: James Cole --- qodana.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 qodana.yml diff --git a/qodana.yml b/qodana.yml new file mode 100644 index 0000000000..33f0ceb027 --- /dev/null +++ b/qodana.yml @@ -0,0 +1,2 @@ +version: "1.0" +linter: jetbrains/qodana-php:2022.3-eap From 6e29a7421ff68ddc1fe02ff7d877d40cafadeaef Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 16:53:07 +0100 Subject: [PATCH 07/12] Rename qodana.yml to qodana.yaml Signed-off-by: James Cole --- qodana.yml => qodana.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename qodana.yml => qodana.yaml (100%) diff --git a/qodana.yml b/qodana.yaml similarity index 100% rename from qodana.yml rename to qodana.yaml From cce856c0e28bd22c06db939a3c23c43973e2ea3e Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 19:09:27 +0100 Subject: [PATCH 08/12] Update qodana.yml Signed-off-by: James Cole --- .github/workflows/qodana.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index eb1fc9b9bd..a0a3bad021 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -12,6 +12,9 @@ jobs: runs-on: ubuntu-latest name: 'Qodana Scan' steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: 'Qodana Scan' uses: JetBrains/qodana-action@main env: From 12ca0811e60f5520138772bf25b58637064fe00d Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 19:16:04 +0100 Subject: [PATCH 09/12] Update qodana.yml Signed-off-by: James Cole --- .github/workflows/qodana.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index a0a3bad021..5054f9af12 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -6,12 +6,18 @@ on: - main - develop pull_request: - types: [opened, synchronize, reopened] + types: [ opened, synchronize, reopened ] jobs: qodana: runs-on: ubuntu-latest name: 'Qodana Scan' steps: + - name: Setup PHP with no coverage driver + uses: shivammathur/setup-php@v2 + with: + php-version: '8.2' + coverage: none + extensions: bcmath, intl - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis From 1964afe8767368fa5111dcf09971a095863ddfa9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 19:21:21 +0100 Subject: [PATCH 10/12] Update qodana.yml Signed-off-by: James Cole --- .github/workflows/qodana.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 5054f9af12..ccdfda2046 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -18,6 +18,8 @@ jobs: php-version: '8.2' coverage: none extensions: bcmath, intl + env: + update: true - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis From 2e074009c4c7c8395d2a075ae3f1f554c1cdef48 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2023 19:41:02 +0100 Subject: [PATCH 11/12] Update qodana.yaml Signed-off-by: James Cole --- qodana.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qodana.yaml b/qodana.yaml index 33f0ceb027..d45fd68bfd 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -1,2 +1,4 @@ +profile: + name: qodana.sanity version: "1.0" linter: jetbrains/qodana-php:2022.3-eap From fb903d5e3a679f019eb82aa3aecf0ead552c6779 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 9 Feb 2023 20:19:50 +0100 Subject: [PATCH 12/12] Update qodana.yaml Signed-off-by: James Cole --- qodana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qodana.yaml b/qodana.yaml index d45fd68bfd..558b7e394d 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -1,4 +1,4 @@ profile: - name: qodana.sanity + name: qodana.starter version: "1.0" linter: jetbrains/qodana-php:2022.3-eap