From 4ea490d8da3477ef6fef6dabf8b06ff7ff49d042 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:05:28 -0500 Subject: [PATCH 001/124] Renaming workflow directory.... --- .gitea/{workflow => workflows}/build.yaml | 0 .gitea/{workflow => workflows}/docker-compose-pr-workflow.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .gitea/{workflow => workflows}/build.yaml (100%) rename .gitea/{workflow => workflows}/docker-compose-pr-workflow.yml (100%) diff --git a/.gitea/workflow/build.yaml b/.gitea/workflows/build.yaml similarity index 100% rename from .gitea/workflow/build.yaml rename to .gitea/workflows/build.yaml diff --git a/.gitea/workflow/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml similarity index 100% rename from .gitea/workflow/docker-compose-pr-workflow.yml rename to .gitea/workflows/docker-compose-pr-workflow.yml From b4dc2752613909266384301fe84285e3d7f08164 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:07:35 -0500 Subject: [PATCH 002/124] Removing build.yaml; correcting gocurl version. --- .gitea/workflows/build.yaml | 87 ------------------- .../workflows/docker-compose-pr-workflow.yml | 2 +- 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 .gitea/workflows/build.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml deleted file mode 100644 index a2988fcc..00000000 --- a/.gitea/workflows/build.yaml +++ /dev/null @@ -1,87 +0,0 @@ -name: Docker Compose PR Workflow - -on: - push: - branches: - - '*' - create: - branches: - - '*' - -jobs: - create-pr-and-validate: - name: Create PR and Validate Docker Compose - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Check if Pull Request Exists - id: check-pr - uses: prasiman/gocurl@v1.2.0 - with: - url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }} - method: GET - headers: | - Authorization: token ${{ secrets.GITEA_API_TOKEN }} - outputs: - response: ${{ steps.check-pr.outputs.response }} - - name: Create Pull Request - if: env.PR_EXISTS != 'true' - uses: arifer612/Gitea-PR-action@v1.2.0 - with: - url: ${{ secrets.RINOA_GITEA_SERVER }} - token: ${{ secrets.BOT_GITEA_TOKEN }} - - name: Run SonarQube Analysis - uses: sonarsource/sonarqube-scan-action@v2.0.0 - with: - SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - extra_args: | - -Dsonar.projectKey=${{ github.repository }} - -Dsonar.sources=. - -Dsonar.inclusions=docker-compose.yml - -Dsonar.language=yaml,docker - - name: Check SonarQube Quality Gate - id: quality-gate - uses: sonarsource/sonarqube-quality-gate-check-action@v2.0.0 - with: - SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - - - name: Validate Docker Compose Configuration - if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' - id: docker-lint - run: | - echo "${{ secrets.DOCKER_ENV }}" > .env - docker compose config --no-interpolate --quiet --dry-run - continue-on-error: true - - - name: Merge Pull Request - if: steps.docker-lint.outcome == 'success' - uses: prasiman/gocurl@v1.2.0 - with: - url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge - method: POST - headers: | - Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} - Content-Type: application/json - body: | - { - "Do": "merge" - } - - deploy-main: - name: Deploy to Remote Host - needs: create-pr-and-validate - if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - steps: - - name: SSH to Remote Host and Deploy Docker Compose - uses: keatonLiu/docker-compose-remote-action@v1.2 - with: - ssh_user: gitea-deploy - ssh_host: 192.168.1.254 - ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} - ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} - compose_file_path: docker-compose.yml - args: "-d --remove-orphans --build --dry-run" diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 8530c652..a185e66b 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 - name: Check if Pull Request Exists id: check-pr - uses: prasiman/gocurl@v1.2.0 + uses: prasiman/gocurl@v1 with: url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }} method: GET From 7679215eabf8e531b6fc72b9b6b617d1e3b402ee Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:10:09 -0500 Subject: [PATCH 003/124] Correcting gocurl version (L60). --- .gitea/workflows/docker-compose-pr-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index a185e66b..f1d2ce3b 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -32,7 +32,7 @@ jobs: url: ${{ secrets.RINOA_GITEA_SERVER }} token: ${{ secrets.BOT_GITEA_TOKEN }} - name: Run SonarQube Analysis - uses: sonarsource/sonarqube-scan-action@v2.0.0 + uses: SonarSource/sonarqube-scan-action@v4.1.0 with: SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} sonar_token: ${{ secrets.SONARQUBE_TOKEN }} @@ -43,7 +43,7 @@ jobs: -Dsonar.language=yaml,docker - name: Check SonarQube Quality Gate id: quality-gate - uses: sonarsource/sonarqube-quality-gate-check-action@v2.0.0 + uses: sonarsource/sonarqube-quality-gate-check-action@v1.1.0 with: SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} sonar_token: ${{ secrets.SONARQUBE_TOKEN }} @@ -57,7 +57,7 @@ jobs: - name: Merge Pull Request if: steps.docker-lint.outcome == 'success' - uses: prasiman/gocurl@v1.2.0 + uses: prasiman/gocurl@v1 with: url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge method: POST From 8a5028b33869348a85a70f07c4b48c30f5b4ce67 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:13:41 -0500 Subject: [PATCH 004/124] Reference correction, L46. --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index f1d2ce3b..52dc468a 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -43,7 +43,7 @@ jobs: -Dsonar.language=yaml,docker - name: Check SonarQube Quality Gate id: quality-gate - uses: sonarsource/sonarqube-quality-gate-check-action@v1.1.0 + uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 with: SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} sonar_token: ${{ secrets.SONARQUBE_TOKEN }} From 6285475c65e9a7aac718c271f2ae469a87dd4491 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:16:45 -0500 Subject: [PATCH 005/124] Quoting the urls in gocurl --- .gitea/workflows/docker-compose-pr-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 52dc468a..b500a82f 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -19,7 +19,7 @@ jobs: id: check-pr uses: prasiman/gocurl@v1 with: - url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }} + url: "${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }}" method: GET headers: | Authorization: token ${{ secrets.GITEA_API_TOKEN }} @@ -59,7 +59,7 @@ jobs: if: steps.docker-lint.outcome == 'success' uses: prasiman/gocurl@v1 with: - url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge + url: "${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge" method: POST headers: | Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} From 8b994ed05d5a90b7929a70bef4e9d88bbc2c4631 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:24:43 -0500 Subject: [PATCH 006/124] Testing PR listing action --- .../workflows/docker-compose-pr-workflow.yml | 127 +++++++++--------- 1 file changed, 63 insertions(+), 64 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index b500a82f..3ed8f26f 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -15,72 +15,71 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Check if Pull Request Exists - id: check-pr - uses: prasiman/gocurl@v1 + - name: Gitea List Pull Requests + id: gitea-check-pr + uses: vicamo/gitea-list-pull-requests@v1.0.1 with: - url: "${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }}" - method: GET - headers: | - Authorization: token ${{ secrets.GITEA_API_TOKEN }} - outputs: - response: ${{ steps.check-pr.outputs.response }} - - name: Create Pull Request - if: env.PR_EXISTS != 'true' - uses: arifer612/Gitea-PR-action@v1.2.0 - with: - url: ${{ secrets.RINOA_GITEA_SERVER }} token: ${{ secrets.BOT_GITEA_TOKEN }} - - name: Run SonarQube Analysis - uses: SonarSource/sonarqube-scan-action@v4.1.0 - with: - SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - extra_args: | - -Dsonar.projectKey=${{ github.repository }} - -Dsonar.sources=. - -Dsonar.inclusions=docker-compose.yml - -Dsonar.language=yaml,docker - - name: Check SonarQube Quality Gate - id: quality-gate - uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 - with: - SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - sonar_token: ${{ secrets.SONARQUBE_TOKEN }} + server_url: ${{ secrets.RINOA_GITEA_SERVER }} + state: open + # - name: Set PR_EXISTS environment variable + # run: echo "PR_EXISTS=${{ steps.gitea-check-pr.outputs.exists }}" >> $GITHUB_ENV + # - name: Create Pull Request + # if: env.PR_EXISTS != 'true' + # uses: arifer612/Gitea-PR-action@v1.2.0 + # with: + # url: ${{ secrets.RINOA_GITEA_SERVER }} + # token: ${{ secrets.BOT_GITEA_TOKEN }} + # # - name: Run SonarQube Analysis + # uses: SonarSource/sonarqube-scan-action@v4.1.0 + # with: + # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} + # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} + # extra_args: | + # -Dsonar.projectKey=${{ github.repository }} + # -Dsonar.sources=. + # -Dsonar.inclusions=docker-compose.yml + # -Dsonar.language=yaml,docker + # - name: Check SonarQube Quality Gate + # id: quality-gate + # uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 + # with: + # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} + # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - - name: Validate Docker Compose Configuration - if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' - id: docker-lint - run: | - echo "${{ secrets.DOCKER_ENV }}" > .env - docker compose config --no-interpolate --quiet --dry-run + # - name: Validate Docker Compose Configuration + # if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' + # id: docker-lint + # run: | + # echo "${{ secrets.DOCKER_ENV }}" > .env + # docker compose config --no-interpolate --quiet --dry-run - - name: Merge Pull Request - if: steps.docker-lint.outcome == 'success' - uses: prasiman/gocurl@v1 - with: - url: "${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge" - method: POST - headers: | - Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} - Content-Type: application/json - body: | - { - "Do": "merge" - } + # - name: Merge Pull Request + # if: steps.docker-lint.outcome == 'success' + # uses: prasiman/gocurl@v1 + # with: + # url: "${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge" + # method: POST + # headers: | + # Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} + # Content-Type: application/json + # body: | + # { + # "Do": "merge" + # } - deploy-main: - name: Deploy to Remote Host - needs: create-pr-and-validate - if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - steps: - - name: SSH to Remote Host and Deploy Docker Compose - uses: keatonLiu/docker-compose-remote-action@v1.2 - with: - ssh_user: gitea-deploy - ssh_host: 192.168.1.254 - ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} - ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} - compose_file_path: docker-compose.yml - args: "-d --remove-orphans --build --dry-run" + # deploy-main: + # name: Deploy to Remote Host + # needs: create-pr-and-validate + # if: github.ref == 'refs/heads/main' + # runs-on: ubuntu-latest + # steps: + # - name: SSH to Remote Host and Deploy Docker Compose + # uses: keatonLiu/docker-compose-remote-action@v1.2 + # with: + # ssh_user: gitea-deploy + # ssh_host: 192.168.1.254 + # ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} + # ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} + # compose_file_path: docker-compose.yml + # args: "-d --remove-orphans --build --dry-run" From 57963981c74f24619a3823557d394ea223926110 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:25:36 -0500 Subject: [PATCH 007/124] Testing PR listing action (all) --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 3ed8f26f..d6f41cd3 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -21,7 +21,7 @@ jobs: with: token: ${{ secrets.BOT_GITEA_TOKEN }} server_url: ${{ secrets.RINOA_GITEA_SERVER }} - state: open + state: all # - name: Set PR_EXISTS environment variable # run: echo "PR_EXISTS=${{ steps.gitea-check-pr.outputs.exists }}" >> $GITHUB_ENV # - name: Create Pull Request From 1ebed517d586f154ef6f9c782c1bf79f15547b15 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:27:03 -0500 Subject: [PATCH 008/124] Testing PR listing action (all) --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index d6f41cd3..cfc37ebc 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 - name: Gitea List Pull Requests id: gitea-check-pr - uses: vicamo/gitea-list-pull-requests@v1.0.1 + uses: vicamo/gitea-list-pull-requests@v1.0.0 with: token: ${{ secrets.BOT_GITEA_TOKEN }} server_url: ${{ secrets.RINOA_GITEA_SERVER }} From 7baea352e7fb938508567ca099964eb5bc06b557 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:29:05 -0500 Subject: [PATCH 009/124] Testing PR listing action (no params/filters). --- .gitea/workflows/docker-compose-pr-workflow.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index cfc37ebc..024f4507 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -18,10 +18,6 @@ jobs: - name: Gitea List Pull Requests id: gitea-check-pr uses: vicamo/gitea-list-pull-requests@v1.0.0 - with: - token: ${{ secrets.BOT_GITEA_TOKEN }} - server_url: ${{ secrets.RINOA_GITEA_SERVER }} - state: all # - name: Set PR_EXISTS environment variable # run: echo "PR_EXISTS=${{ steps.gitea-check-pr.outputs.exists }}" >> $GITHUB_ENV # - name: Create Pull Request From e8557f54b98900056c4c494bfe89a376578418c1 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:32:25 -0500 Subject: [PATCH 010/124] Testing PR listing action (params/filters again). --- .gitea/workflows/docker-compose-pr-workflow.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 024f4507..5d56d807 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -18,6 +18,11 @@ jobs: - name: Gitea List Pull Requests id: gitea-check-pr uses: vicamo/gitea-list-pull-requests@v1.0.0 + with: + token: "${{ secrets.BOT_GITEA_TOKEN }}" + server_url: "${{ secrets.RINOA_GITEA_SERVER }}" + state: 'all' + # - name: Set PR_EXISTS environment variable # run: echo "PR_EXISTS=${{ steps.gitea-check-pr.outputs.exists }}" >> $GITHUB_ENV # - name: Create Pull Request From 8412137ae81668fe94229fd109abc8a47e949500 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 13:34:54 -0500 Subject: [PATCH 011/124] Testing PR listing action (params/filters again). --- .gitea/workflows/docker-compose-pr-workflow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 5d56d807..e4ab1d33 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -15,9 +15,12 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 + - name: URL check + run: | + echo "${{ secrets.RINOA_GITEA_SERVER }}" - name: Gitea List Pull Requests id: gitea-check-pr - uses: vicamo/gitea-list-pull-requests@v1.0.0 + uses: vicamo/gitea-list-pull-requests@v1.0.1 with: token: "${{ secrets.BOT_GITEA_TOKEN }}" server_url: "${{ secrets.RINOA_GITEA_SERVER }}" From 22eba6b7b8dc552b4bfde34c6aeb671f8713a29f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 14:37:52 -0500 Subject: [PATCH 012/124] Reverting back to an earlier iteration of the build (from 183e3130ee). --- .../workflows/docker-compose-pr-workflow.yml | 189 +++++++++++------- 1 file changed, 118 insertions(+), 71 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index e4ab1d33..596053d5 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -3,87 +3,134 @@ name: Docker Compose PR Workflow on: push: branches: - - '*' - create: - branches: - - '*' + - main + pull_request: + types: [opened, synchronize, reopened] +name: SonarQube Scan jobs: - create-pr-and-validate: - name: Create PR and Validate Docker Compose + sonarqube: + name: SonarQube Scanning & Status runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: URL check - run: | - echo "${{ secrets.RINOA_GITEA_SERVER }}" - - name: Gitea List Pull Requests - id: gitea-check-pr - uses: vicamo/gitea-list-pull-requests@v1.0.1 - with: - token: "${{ secrets.BOT_GITEA_TOKEN }}" - server_url: "${{ secrets.RINOA_GITEA_SERVER }}" - state: 'all' - - # - name: Set PR_EXISTS environment variable - # run: echo "PR_EXISTS=${{ steps.gitea-check-pr.outputs.exists }}" >> $GITHUB_ENV - # - name: Create Pull Request - # if: env.PR_EXISTS != 'true' - # uses: arifer612/Gitea-PR-action@v1.2.0 - # with: - # url: ${{ secrets.RINOA_GITEA_SERVER }} - # token: ${{ secrets.BOT_GITEA_TOKEN }} - # # - name: Run SonarQube Analysis - # uses: SonarSource/sonarqube-scan-action@v4.1.0 - # with: - # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - # extra_args: | - # -Dsonar.projectKey=${{ github.repository }} - # -Dsonar.sources=. - # -Dsonar.inclusions=docker-compose.yml - # -Dsonar.language=yaml,docker - # - name: Check SonarQube Quality Gate - # id: quality-gate - # uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 - # with: - # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} + - name: Checking out + uses: actions/checkout@v4 + with: + # Disabling shallow clone is recommended for improving relevancy of reporting + fetch-depth: 0 - # - name: Validate Docker Compose Configuration - # if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' - # id: docker-lint + - name: SonarQube Scan + uses: SonarSource/sonarqube-scan-action@v4.0.0 + env: + SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + + - name: SonarQube Quality Gate Check + id: quality-gate + uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 + env: + SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + + # - name: Comment on Pull Request with Quality Gate Status + # id: comment-pr + # uses: prasiman/gocurl@v1 + # with: + # method: POST + # url: "https://${{ secrets.RINOA_GITEA_SERVER }}/api/v1/repos/${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}/issues/${{ github.event.pull_request.number }}/reviews" + # headers: > + # Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} + # body: | + # { + # "body": "SonarQube Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" + # } + + docker-compose-dry-run: + name: Dry Run Docker Compose + runs-on: ubuntu-latest + needs: quality-gate + if: ${{ steps.quality-gate.outputs.quality-gate-status }} == 'PASSED' + steps: + - name: Checking out + uses: actions/checkout@v4 + with: + # Disabling shallow clone is recommended for improving relevancy of reporting + fetch-depth: 0 + + - name: Generate ephemeral env + run: | + echo "${{ secrets.RINOA_DOCKER_ENV }}" > ./.env + + - name: Validate Docker Compose Configuration + id: docker-lint + run: | + docker compose config --no-interpolate --quiet --dry-run + EXIT_CODE=$? + if [ $? -ne 0 ]; then + echo "Docker Compose configuration validation failed." + exit 1 + else + echo "Docker Compose configuration is valid." + fi + echo "::set-output name=exit_code::$EXIT_CODE" + + # - name: Docker Compose Lint + # uses: sjafferali/docker-compose-lint-action@v0.1.2 + # with: + # compose-file: './docker-compose.yml' + + # manual-approval: + # name: Manual Approval + # needs: docker-compose-test + # if: always() + # runs-on: self-hosted + # steps: + # - name: Approval Required # run: | - # echo "${{ secrets.DOCKER_ENV }}" > .env - # docker compose config --no-interpolate --quiet --dry-run + # echo "Manual approval step reached. Please approve to proceed." + # exit 1 + + deploy-changes: + name: Merge and Deploy Changes + runs-on: ubuntu-latest + needs: docker-lint + if: steps.docker-lint.outputs.exit_code == 0 + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Install & Setup Tea CLI + run: | + curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea + chmod +x /usr/local/bin/tea + tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}"" --user gitea-sonarqube-bot --token "${{ secrets.BOT_GITEA_TOKEN }}" + + - name: Merge PR with Tea CLI + run: | + tea pr m "${{ gitea.event.pull_request.number }}" # - name: Merge Pull Request - # if: steps.docker-lint.outcome == 'success' # uses: prasiman/gocurl@v1 # with: - # url: "${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge" # method: POST - # headers: | + # url: "https://${{ secrets.RINOA_GITEA_SERVER }}/api/v1/repos/${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge" + # headers: > # Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} - # Content-Type: application/json - # body: | - # { - # "Do": "merge" - # } - # deploy-main: - # name: Deploy to Remote Host - # needs: create-pr-and-validate - # if: github.ref == 'refs/heads/main' - # runs-on: ubuntu-latest - # steps: - # - name: SSH to Remote Host and Deploy Docker Compose - # uses: keatonLiu/docker-compose-remote-action@v1.2 - # with: - # ssh_user: gitea-deploy - # ssh_host: 192.168.1.254 - # ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} - # ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} - # compose_file_path: docker-compose.yml - # args: "-d --remove-orphans --build --dry-run" + - name: Deploy Docker Compose Changes + uses: astappiev/docker-compose-remote-action@master + with: + ssh_host: 192.168.1.254 + ssh_user: gitea-deploy + ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} + ssh_host_public_key: ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} + docker_env: $ {{ secrets.RINOA_DOCKER_ENV }} + docker_args: -d --remove-orphans --build --dry-run + + # uses: alex-ac/github-action-ssh-docker-compose@master + # with: + # ssh_host: ${{ secrets.DOCKER_HOST }} + # ssh_user: ${{ secrets.DOCKER_USER }} + # ssh_key: ${{ secrets.DOCKER_SSH_KEY }} + # compose_file_path: /path/to/docker-compose.yml + # docker_compose_command: "up -d --remove-orphans" \ No newline at end of file From 31f85ffad1ce54de2ab0d7a1fc258101f4201f8c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 14:39:56 -0500 Subject: [PATCH 013/124] Reverting back to an earlier iteration of the build (from 183e3130ee) with a slight tweak. --- .gitea/workflows/docker-compose-pr-workflow.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 596053d5..c2d69fcc 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -3,9 +3,10 @@ name: Docker Compose PR Workflow on: push: branches: - - main - pull_request: - types: [opened, synchronize, reopened] + - '*' + create: + branches: + - '*' name: SonarQube Scan jobs: From e482c3e5e9d4768392c3f6d827ffb7e4e87b0f74 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 14:41:41 -0500 Subject: [PATCH 014/124] Redundant field is redundant... --- .gitea/workflows/docker-compose-pr-workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index c2d69fcc..7f7e6e15 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -8,7 +8,6 @@ on: branches: - '*' -name: SonarQube Scan jobs: sonarqube: name: SonarQube Scanning & Status From 7eba8d0ea828b36dd91c0ba3c5d0b97303534c7d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 14:45:57 -0500 Subject: [PATCH 015/124] Typo fix (L106). --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 7f7e6e15..67c0485e 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -103,7 +103,7 @@ jobs: run: | curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea chmod +x /usr/local/bin/tea - tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}"" --user gitea-sonarqube-bot --token "${{ secrets.BOT_GITEA_TOKEN }}" + tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --token "${{ secrets.BOT_GITEA_TOKEN }}" - name: Merge PR with Tea CLI run: | From 211eba57722f33a0966fa4a2f84a8b987e0cf5d5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 14:50:54 -0500 Subject: [PATCH 016/124] Password flag (L106). --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 67c0485e..8e00b0b5 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -103,7 +103,7 @@ jobs: run: | curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea chmod +x /usr/local/bin/tea - tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --token "${{ secrets.BOT_GITEA_TOKEN }}" + tea login add --n gitea-rinoa --u "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --pwd "${{ secrets.BOT_GITEA_PASSWORD }}" --t "${{ secrets.BOT_GITEA_TOKEN }}" - name: Merge PR with Tea CLI run: | From 94a60dd7e9712524e0d8c6857b9eb7373e39558d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 6 Dec 2024 15:00:13 -0500 Subject: [PATCH 017/124] L111 --- .gitea/workflows/docker-compose-pr-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 8e00b0b5..bd4f4eff 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -107,7 +107,8 @@ jobs: - name: Merge PR with Tea CLI run: | - tea pr m "${{ gitea.event.pull_request.number }}" + echo "${{ gitea.event.pull_request.number }}" + tea pr m --message "Automatically merged by GitHub Actions" "${{ gitea.event.pull_request.number }}" # - name: Merge Pull Request # uses: prasiman/gocurl@v1 From f7cf25e66a0c7934ed7074de54462881b1cf3161 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 18:48:12 -0500 Subject: [PATCH 018/124] Tweaking yet again (losing count here...). --- .../workflows/docker-compose-pr-workflow.yml | 186 ++++++------------ 1 file changed, 65 insertions(+), 121 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index bd4f4eff..157d89ae 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -9,129 +9,73 @@ on: - '*' jobs: - sonarqube: - name: SonarQube Scanning & Status + create-pr-and-validate: + name: Create PR and Validate Docker Compose runs-on: ubuntu-latest steps: - - name: Checking out - uses: actions/checkout@v4 - with: - # Disabling shallow clone is recommended for improving relevancy of reporting - fetch-depth: 0 - - - name: SonarQube Scan - uses: SonarSource/sonarqube-scan-action@v4.0.0 - env: - SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} - SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - - - name: SonarQube Quality Gate Check - id: quality-gate - uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 - env: - SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} - SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - - # - name: Comment on Pull Request with Quality Gate Status - # id: comment-pr - # uses: prasiman/gocurl@v1 - # with: - # method: POST - # url: "https://${{ secrets.RINOA_GITEA_SERVER }}/api/v1/repos/${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}/issues/${{ github.event.pull_request.number }}/reviews" - # headers: > - # Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} - # body: | - # { - # "body": "SonarQube Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" - # } - - docker-compose-dry-run: - name: Dry Run Docker Compose - runs-on: ubuntu-latest - needs: quality-gate - if: ${{ steps.quality-gate.outputs.quality-gate-status }} == 'PASSED' - steps: - - name: Checking out - uses: actions/checkout@v4 - with: - # Disabling shallow clone is recommended for improving relevancy of reporting - fetch-depth: 0 - - - name: Generate ephemeral env - run: | - echo "${{ secrets.RINOA_DOCKER_ENV }}" > ./.env - - - name: Validate Docker Compose Configuration - id: docker-lint - run: | - docker compose config --no-interpolate --quiet --dry-run - EXIT_CODE=$? - if [ $? -ne 0 ]; then - echo "Docker Compose configuration validation failed." - exit 1 - else - echo "Docker Compose configuration is valid." - fi - echo "::set-output name=exit_code::$EXIT_CODE" - - # - name: Docker Compose Lint - # uses: sjafferali/docker-compose-lint-action@v0.1.2 - # with: - # compose-file: './docker-compose.yml' - - # manual-approval: - # name: Manual Approval - # needs: docker-compose-test - # if: always() - # runs-on: self-hosted - # steps: - # - name: Approval Required - # run: | - # echo "Manual approval step reached. Please approve to proceed." - # exit 1 - - deploy-changes: - name: Merge and Deploy Changes - runs-on: ubuntu-latest - needs: docker-lint - if: steps.docker-lint.outputs.exit_code == 0 - steps: - - name: Checkout Code + - name: Checkout Repository uses: actions/checkout@v4 - - - name: Install & Setup Tea CLI - run: | - curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea - chmod +x /usr/local/bin/tea - tea login add --n gitea-rinoa --u "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --pwd "${{ secrets.BOT_GITEA_PASSWORD }}" --t "${{ secrets.BOT_GITEA_TOKEN }}" - - - name: Merge PR with Tea CLI - run: | - echo "${{ gitea.event.pull_request.number }}" - tea pr m --message "Automatically merged by GitHub Actions" "${{ gitea.event.pull_request.number }}" - - # - name: Merge Pull Request - # uses: prasiman/gocurl@v1 - # with: - # method: POST - # url: "https://${{ secrets.RINOA_GITEA_SERVER }}/api/v1/repos/${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge" - # headers: > - # Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} - - - name: Deploy Docker Compose Changes - uses: astappiev/docker-compose-remote-action@master + - name: Check if Pull Request Exists + id: check-pr + uses: prasiman/gocurl@v1.2.0 with: - ssh_host: 192.168.1.254 - ssh_user: gitea-deploy - ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} - ssh_host_public_key: ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} - docker_env: $ {{ secrets.RINOA_DOCKER_ENV }} - docker_args: -d --remove-orphans --build --dry-run + url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }} + method: GET + headers: | + Authorization: token ${{ secrets.GITEA_API_TOKEN }} + outputs: + response: ${{ steps.check-pr.outputs.response }} + - name: Create Pull Request + if: env.PR_EXISTS != 'true' + uses: arifer612/Gitea-PR-action@v1.2.0 + with: + url: ${{ secrets.RINOA_GITEA_SERVER }} + token: ${{ secrets.BOT_GITEA_TOKEN }} + - name: Run SonarQube Analysis + uses: sonarsource/sonarqube-scan-action@v4.1.0 + with: + SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} + sonar_token: ${{ secrets.SONARQUBE_TOKEN }} + - name: Check SonarQube Quality Gate + id: quality-gate + uses: sonarsource/sonarqube-quality-gate-check-action@v2.0.0 + with: + SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} + sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - # uses: alex-ac/github-action-ssh-docker-compose@master - # with: - # ssh_host: ${{ secrets.DOCKER_HOST }} - # ssh_user: ${{ secrets.DOCKER_USER }} - # ssh_key: ${{ secrets.DOCKER_SSH_KEY }} - # compose_file_path: /path/to/docker-compose.yml - # docker_compose_command: "up -d --remove-orphans" \ No newline at end of file + - name: Validate Docker Compose Configuration + if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' + id: docker-lint + run: | + echo "${{ secrets.DOCKER_ENV }}" > .env + docker compose config --no-interpolate --quiet --dry-run + + - name: Merge Pull Request + if: steps.docker-lint.outcome == 'success' + uses: prasiman/gocurl@v1.2.0 + with: + url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge + method: POST + headers: | + Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} + Content-Type: application/json + body: | + { + "Do": "merge" + } + + deploy-main: + name: Deploy to Remote Host + needs: create-pr-and-validate + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + steps: + - name: SSH to Remote Host and Deploy Docker Compose + uses: keatonLiu/docker-compose-remote-action@v1.2 + with: + ssh_user: gitea-deploy + ssh_host: 192.168.1.254 + ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} + ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} + compose_file_path: docker-compose.yml + args: "-d --remove-orphans --build --dry-run" From 710b150f6fe7a150449d0e1f4ec78fcfe1571f4b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 18:51:48 -0500 Subject: [PATCH 019/124] gocurl version ref fix. --- .gitea/workflows/docker-compose-pr-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 157d89ae..0f1f447a 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 - name: Check if Pull Request Exists id: check-pr - uses: prasiman/gocurl@v1.2.0 + uses: prasiman/gocurl@v1 with: url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }} method: GET @@ -52,10 +52,10 @@ jobs: - name: Merge Pull Request if: steps.docker-lint.outcome == 'success' - uses: prasiman/gocurl@v1.2.0 + uses: prasiman/gocurl@v1 with: url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge - method: POST + method: "POST" headers: | Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} Content-Type: application/json From 1ec34a221bc1d00a0c85422096cec1c99b46c940 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 18:56:55 -0500 Subject: [PATCH 020/124] Sonarsource quality gate check ref fix. --- .gitea/workflows/docker-compose-pr-workflow.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 0f1f447a..f6e2077c 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -20,9 +20,11 @@ jobs: uses: prasiman/gocurl@v1 with: url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }} - method: GET - headers: | - Authorization: token ${{ secrets.GITEA_API_TOKEN }} + method: "GET" + headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' + log-response: true + - name: Set PR_EXISTS Environment Variable + run: echo "PR_EXISTS=${{ contains(steps.check-pr.outputs.response, 'number') } outputs: response: ${{ steps.check-pr.outputs.response }} - name: Create Pull Request @@ -31,14 +33,16 @@ jobs: with: url: ${{ secrets.RINOA_GITEA_SERVER }} token: ${{ secrets.BOT_GITEA_TOKEN }} + - name: Run SonarQube Analysis uses: sonarsource/sonarqube-scan-action@v4.1.0 with: SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} sonar_token: ${{ secrets.SONARQUBE_TOKEN }} + - name: Check SonarQube Quality Gate id: quality-gate - uses: sonarsource/sonarqube-quality-gate-check-action@v2.0.0 + uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 with: SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} sonar_token: ${{ secrets.SONARQUBE_TOKEN }} @@ -56,6 +60,7 @@ jobs: with: url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge method: "POST" + log-response: true headers: | Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} Content-Type: application/json From 0aeeb5f4f7d05ca8ad1af32432a04574d60a47a7 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 19:28:50 -0500 Subject: [PATCH 021/124] Testing PR logic. --- .../workflows/docker-compose-pr-workflow.yml | 116 +++++++++--------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index f6e2077c..1754bd42 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -19,68 +19,72 @@ jobs: id: check-pr uses: prasiman/gocurl@v1 with: - url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository_owner }}/pulls?state=open&head=${{ github.repository_owner }}:${{ github.ref_name }} + url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository_owner }}/pulls + params: '{ "state": "open" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' log-response: true - - name: Set PR_EXISTS Environment Variable - run: echo "PR_EXISTS=${{ contains(steps.check-pr.outputs.response, 'number') } - outputs: - response: ${{ steps.check-pr.outputs.response }} - - name: Create Pull Request - if: env.PR_EXISTS != 'true' - uses: arifer612/Gitea-PR-action@v1.2.0 + - name: Parse Response + id: parse-response + uses: yakubique/json-utils@v1.8 with: - url: ${{ secrets.RINOA_GITEA_SERVER }} - token: ${{ secrets.BOT_GITEA_TOKEN }} + inputs: ${{ steps.check-pr.response }} + action: "get" + key: "data" + # - name: Create Pull Request + # if: + # uses: arifer612/Gitea-PR-action@v1.2.0 + # with: + # url: ${{ secrets.RINOA_GITEA_SERVER }} + # token: ${{ secrets.BOT_GITEA_TOKEN }} - - name: Run SonarQube Analysis - uses: sonarsource/sonarqube-scan-action@v4.1.0 - with: - SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - sonar_token: ${{ secrets.SONARQUBE_TOKEN }} + # - name: Run SonarQube Analysis + # uses: sonarsource/sonarqube-scan-action@v4.1.0 + # with: + # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} + # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - - name: Check SonarQube Quality Gate - id: quality-gate - uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 - with: - SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - sonar_token: ${{ secrets.SONARQUBE_TOKEN }} + # - name: Check SonarQube Quality Gate + # id: quality-gate + # uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 + # with: + # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} + # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - - name: Validate Docker Compose Configuration - if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' - id: docker-lint - run: | - echo "${{ secrets.DOCKER_ENV }}" > .env - docker compose config --no-interpolate --quiet --dry-run + # - name: Validate Docker Compose Configuration + # if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' + # id: docker-lint + # run: | + # echo "${{ secrets.DOCKER_ENV }}" > .env + # docker compose config --no-interpolate --quiet --dry-run - - name: Merge Pull Request - if: steps.docker-lint.outcome == 'success' - uses: prasiman/gocurl@v1 - with: - url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge - method: "POST" - log-response: true - headers: | - Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} - Content-Type: application/json - body: | - { - "Do": "merge" - } + # - name: Merge Pull Request + # if: steps.docker-lint.outcome == 'success' + # uses: prasiman/gocurl@v1 + # with: + # url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge + # method: "POST" + # log-response: true + # headers: | + # Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} + # Content-Type: application/json + # body: | + # { + # "Do": "merge" + # } - deploy-main: - name: Deploy to Remote Host - needs: create-pr-and-validate - if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - steps: - - name: SSH to Remote Host and Deploy Docker Compose - uses: keatonLiu/docker-compose-remote-action@v1.2 - with: - ssh_user: gitea-deploy - ssh_host: 192.168.1.254 - ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} - ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} - compose_file_path: docker-compose.yml - args: "-d --remove-orphans --build --dry-run" + # deploy-main: + # name: Deploy to Remote Host + # needs: create-pr-and-validate + # if: github.ref == 'refs/heads/main' + # runs-on: ubuntu-latest + # steps: + # - name: SSH to Remote Host and Deploy Docker Compose + # uses: keatonLiu/docker-compose-remote-action@v1.2 + # with: + # ssh_user: gitea-deploy + # ssh_host: 192.168.1.254 + # ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} + # ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} + # compose_file_path: docker-compose.yml + # args: "-d --remove-orphans --build --dry-run" From fca5856e9f1a2ccd7e4d6045227e3007d98b5a5c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 19:36:36 -0500 Subject: [PATCH 022/124] Testing PR logic #2. --- .gitea/workflows/docker-compose-pr-workflow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 1754bd42..e340c8eb 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -15,11 +15,14 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 + - name: Verify URL + run: | + echo "Verifying URL: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository }}/pulls" - name: Check if Pull Request Exists id: check-pr uses: prasiman/gocurl@v1 with: - url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository_owner }}/pulls + url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository }}/pulls params: '{ "state": "open" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' From f96e1a8e40cc5cd76b39f47fd8b52ce6c59fcaac Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 19:44:15 -0500 Subject: [PATCH 023/124] Testing PR logic #3 (added variable for baseApiUrl. --- .gitea/workflows/docker-compose-pr-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index e340c8eb..aa7e984c 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -17,12 +17,12 @@ jobs: uses: actions/checkout@v4 - name: Verify URL run: | - echo "Verifying URL: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository }}/pulls" + echo "Verifying URL: ${{ vars.RINOA_GITEA_API }}/repos/${{ github.repository }}/pulls" - name: Check if Pull Request Exists id: check-pr uses: prasiman/gocurl@v1 with: - url: ${{ secrets.RINOA_GITEA_SERVER }}/repos/${{ github.repository }}/pulls + url: ${{ vars.RINOA_GITEA_API }}/repos/${{ github.repository }}/pulls params: '{ "state": "open" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' From d06c9318f5620a4d649e8d48d53b41c7a821f18e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 19:49:27 -0500 Subject: [PATCH 024/124] Typo fix with json-utils action. --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index aa7e984c..fd08fdd4 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -31,7 +31,7 @@ jobs: id: parse-response uses: yakubique/json-utils@v1.8 with: - inputs: ${{ steps.check-pr.response }} + input: ${{ steps.check-pr.response }} action: "get" key: "data" # - name: Create Pull Request From 2d78d08c16677888b0499a4aa58d8a2e31ec9947 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:17:27 -0500 Subject: [PATCH 025/124] using gitea-list-pr action instead of re-inventing the wheel with curl... --- .../workflows/docker-compose-pr-workflow.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index fd08fdd4..e0fa11fe 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -15,25 +15,19 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Verify URL - run: | - echo "Verifying URL: ${{ vars.RINOA_GITEA_API }}/repos/${{ github.repository }}/pulls" - name: Check if Pull Request Exists id: check-pr - uses: prasiman/gocurl@v1 + uses: vicamo/gitea-list-pull-requests@v1 with: - url: ${{ vars.RINOA_GITEA_API }}/repos/${{ github.repository }}/pulls - params: '{ "state": "open" }' - method: "GET" - headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' - log-response: true + token: ${{ secrets.BOT_GITEA_TOKEN }} + server_url: $$ {{ vars.RINOA_GITEA_URL }} + state: 'open' - name: Parse Response id: parse-response uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.check-pr.response }} - action: "get" - key: "data" + input: "${{ steps.check-pr.outputs.json }}" + action: "none" # - name: Create Pull Request # if: # uses: arifer612/Gitea-PR-action@v1.2.0 From f1a935f9a0b7342a62edd79968d4a1bffd19d763 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:20:53 -0500 Subject: [PATCH 026/124] Var fixes --- .gitea/workflows/docker-compose-pr-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index e0fa11fe..7b553bf6 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -19,8 +19,8 @@ jobs: id: check-pr uses: vicamo/gitea-list-pull-requests@v1 with: - token: ${{ secrets.BOT_GITEA_TOKEN }} - server_url: $$ {{ vars.RINOA_GITEA_URL }} + token: "${{ secrets.BOT_GITEA_TOKEN }}" + server_url: "$$ {{ vars.RINOA_GITEA_URL }}" state: 'open' - name: Parse Response id: parse-response From bc16ec6cc5a938e72827a54b7ce064ac9732b396 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:22:44 -0500 Subject: [PATCH 027/124] ... I'm an idiot (L23). --- .gitea/workflows/docker-compose-pr-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 7b553bf6..c279bf28 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -19,8 +19,8 @@ jobs: id: check-pr uses: vicamo/gitea-list-pull-requests@v1 with: - token: "${{ secrets.BOT_GITEA_TOKEN }}" - server_url: "$$ {{ vars.RINOA_GITEA_URL }}" + token: ${{ secrets.BOT_GITEA_TOKEN }} + server_url: $ {{ vars.RINOA_GITEA_URL }} state: 'open' - name: Parse Response id: parse-response From 266a526ad20731568111fbcba40fcdd58c9195e8 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:23:26 -0500 Subject: [PATCH 028/124] ... I'm an idiot again (L23). --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index c279bf28..4bab67e0 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -20,7 +20,7 @@ jobs: uses: vicamo/gitea-list-pull-requests@v1 with: token: ${{ secrets.BOT_GITEA_TOKEN }} - server_url: $ {{ vars.RINOA_GITEA_URL }} + server_url: ${{ vars.RINOA_GITEA_URL }} state: 'open' - name: Parse Response id: parse-response From 206466265ea976c59faa89f89d274f097f2472b8 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:24:40 -0500 Subject: [PATCH 029/124] Testing list PR action --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 4bab67e0..6c8b3a9f 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -21,7 +21,7 @@ jobs: with: token: ${{ secrets.BOT_GITEA_TOKEN }} server_url: ${{ vars.RINOA_GITEA_URL }} - state: 'open' + state: 'all' - name: Parse Response id: parse-response uses: yakubique/json-utils@v1.8 From 76af8c8e340b4259b2785bac2dd13076f4167057 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:27:06 -0500 Subject: [PATCH 030/124] Testing list PR action --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 6c8b3a9f..26f2fb2f 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -20,7 +20,7 @@ jobs: uses: vicamo/gitea-list-pull-requests@v1 with: token: ${{ secrets.BOT_GITEA_TOKEN }} - server_url: ${{ vars.RINOA_GITEA_URL }} + server_url: https://git.trez.wtf state: 'all' - name: Parse Response id: parse-response From 71f734fe5031540df6ac07b299e2951ef2a4e5c2 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:30:24 -0500 Subject: [PATCH 031/124] Testing list PR action still. --- .gitea/workflows/docker-compose-pr-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 26f2fb2f..ae170146 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -15,9 +15,9 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Check if Pull Request Exists - id: check-pr - uses: vicamo/gitea-list-pull-requests@v1 + - name: List PRs + id: list-prs + uses: vicamo/gitea-list-pull-requests@v1.0.1 with: token: ${{ secrets.BOT_GITEA_TOKEN }} server_url: https://git.trez.wtf @@ -26,7 +26,7 @@ jobs: id: parse-response uses: yakubique/json-utils@v1.8 with: - input: "${{ steps.check-pr.outputs.json }}" + input: "${{ steps.list-prs.outputs.json }}" action: "none" # - name: Create Pull Request # if: From 76a410e639dde4b1d6b678361c8d0d3f13aad159 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:31:43 -0500 Subject: [PATCH 032/124] Testing list PR action still. --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index ae170146..f3355152 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -21,7 +21,7 @@ jobs: with: token: ${{ secrets.BOT_GITEA_TOKEN }} server_url: https://git.trez.wtf - state: 'all' + state: 'closed' - name: Parse Response id: parse-response uses: yakubique/json-utils@v1.8 From d6c1cc2143212471d718bb1e95e71ed8c01733fe Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:36:10 -0500 Subject: [PATCH 033/124] Reverting back to gocurl (gitea-list-pr action wasn't returning any actual responses). --- .gitea/workflows/docker-compose-pr-workflow.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index f3355152..d2d51e0a 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -17,11 +17,13 @@ jobs: uses: actions/checkout@v4 - name: List PRs id: list-prs - uses: vicamo/gitea-list-pull-requests@v1.0.1 + uses: prasiman/gocurl@v1 with: - token: ${{ secrets.BOT_GITEA_TOKEN }} - server_url: https://git.trez.wtf - state: 'closed' + url: ${{ vars.RINOA_GITEA_API }}/api/v1/repos/${{ github.repository }}/pulls + params: '{ "state": "all" }' + method: "GET" + headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' + log-response: true - name: Parse Response id: parse-response uses: yakubique/json-utils@v1.8 From 5b1b1e9d859277f669fc9c55f2983c7d811d4010 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:37:38 -0500 Subject: [PATCH 034/124] Testing again with gocurl. --- .gitea/workflows/docker-compose-pr-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index d2d51e0a..7c1d2b24 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -20,7 +20,7 @@ jobs: uses: prasiman/gocurl@v1 with: url: ${{ vars.RINOA_GITEA_API }}/api/v1/repos/${{ github.repository }}/pulls - params: '{ "state": "all" }' + params: '{ "state": "closed" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' log-response: true @@ -28,7 +28,7 @@ jobs: id: parse-response uses: yakubique/json-utils@v1.8 with: - input: "${{ steps.list-prs.outputs.json }}" + input: "${{ steps.list-prs.outputs.response }}" action: "none" # - name: Create Pull Request # if: From d4fe823d0a6839ca20855eee94def1f4deafab22 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 12 Dec 2024 20:39:09 -0500 Subject: [PATCH 035/124] Var fixes --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 7c1d2b24..f0814001 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -19,7 +19,7 @@ jobs: id: list-prs uses: prasiman/gocurl@v1 with: - url: ${{ vars.RINOA_GITEA_API }}/api/v1/repos/${{ github.repository }}/pulls + url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls params: '{ "state": "closed" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' From e9860eefbdba2bb79719479d39e1897cef3eb178 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 13 Dec 2024 06:09:45 -0500 Subject: [PATCH 036/124] Testing again with gocurl. --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index f0814001..7f17add2 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -20,7 +20,7 @@ jobs: uses: prasiman/gocurl@v1 with: url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls - params: '{ "state": "closed" }' + params: '{ "state": "all" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' log-response: true From d2a5ab86389fd23fb25d6df58c46cb81f844b7ba Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 13 Dec 2024 06:25:20 -0500 Subject: [PATCH 037/124] Removing filter params for now. --- .gitea/workflows/docker-compose-pr-workflow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 7f17add2..cf21c90a 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -20,7 +20,6 @@ jobs: uses: prasiman/gocurl@v1 with: url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls - params: '{ "state": "all" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' log-response: true @@ -28,7 +27,7 @@ jobs: id: parse-response uses: yakubique/json-utils@v1.8 with: - input: "${{ steps.list-prs.outputs.response }}" + input: "${{ steps.list-prs.outputs.response.data }}" action: "none" # - name: Create Pull Request # if: From c67f2b4dd10d2cd9cf0f6fd508f292766305236c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 13 Dec 2024 06:32:32 -0500 Subject: [PATCH 038/124] Testing again with gocurl. --- .gitea/workflows/docker-compose-pr-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index cf21c90a..5779eba6 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -20,6 +20,7 @@ jobs: uses: prasiman/gocurl@v1 with: url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls + params: '{ "state": "open" }' method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' log-response: true From e22cbb78bc715df3dfae85eef5144b3d3770ca48 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 13 Dec 2024 06:34:24 -0500 Subject: [PATCH 039/124] Testing json-utils action --- .gitea/workflows/docker-compose-pr-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 5779eba6..d5d7eeca 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -28,7 +28,7 @@ jobs: id: parse-response uses: yakubique/json-utils@v1.8 with: - input: "${{ steps.list-prs.outputs.response.data }}" + input: ${{ steps.list-prs.outputs.response }} action: "none" # - name: Create Pull Request # if: From ee6caff5ebf75ca45f39fc58c57af8b68643ea2c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 13 Dec 2024 06:36:21 -0500 Subject: [PATCH 040/124] Testing json-utils get action --- .gitea/workflows/docker-compose-pr-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index d5d7eeca..78682e80 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -29,7 +29,8 @@ jobs: uses: yakubique/json-utils@v1.8 with: input: ${{ steps.list-prs.outputs.response }} - action: "none" + action: "get" + key: "data" # - name: Create Pull Request # if: # uses: arifer612/Gitea-PR-action@v1.2.0 From e24e3b38f939f3280a016cd978215407f3255eb3 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Fri, 13 Dec 2024 06:44:33 -0500 Subject: [PATCH 041/124] Testing json-utils get action #2 --- .gitea/workflows/docker-compose-pr-workflow.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 78682e80..43b136e1 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - name: List PRs - id: list-prs + id: listprs uses: prasiman/gocurl@v1 with: url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls @@ -25,10 +25,9 @@ jobs: headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' log-response: true - name: Parse Response - id: parse-response uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.list-prs.outputs.response }} + input: ${{ steps.listprs.outputs.response }} action: "get" key: "data" # - name: Create Pull Request From db84e0673c79461ac0449445270691545f2d35d9 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 17:57:41 -0500 Subject: [PATCH 042/124] Fiddling around with gocurl and Gitea API responses... --- .gitea/workflows/docker-compose-pr-workflow.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml index 43b136e1..db504a44 100644 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ b/.gitea/workflows/docker-compose-pr-workflow.yml @@ -24,12 +24,15 @@ jobs: method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' log-response: true - - name: Parse Response - uses: yakubique/json-utils@v1.8 - with: - input: ${{ steps.listprs.outputs.response }} - action: "get" - key: "data" + - name: Var test + run: | + echo ${{ steps.listprs.outputs.response }} + # - name: Parse Response + # uses: yakubique/json-utils@v1.8 + # with: + # input: ${{ steps.listprs.outputs.response }} + # action: "get" + # key: "data" # - name: Create Pull Request # if: # uses: arifer612/Gitea-PR-action@v1.2.0 From b5e22e53353ec935073c7b71a6588c4432392846 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 20:58:41 -0500 Subject: [PATCH 043/124] Removing old flow (hooray for Komodo!) --- .../workflows/branch-sonarscan-pr-merge.yml | 103 ++++++++++++++++++ .../workflows/docker-compose-pr-workflow.yml | 92 ---------------- 2 files changed, 103 insertions(+), 92 deletions(-) create mode 100644 .gitea/workflows/branch-sonarscan-pr-merge.yml delete mode 100644 .gitea/workflows/docker-compose-pr-workflow.yml diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml new file mode 100644 index 00000000..dc98bf34 --- /dev/null +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -0,0 +1,103 @@ +name: Gitea Branch PR, SonarQube Analyze, and Merge Workflow + +on: + push: + branches-ignore: + - main + create: + branches: + - '**' + +jobs: + # Job 1: Check if PR exists and create one if the branch is new + check-and-create-pr: + runs-on: ubuntu-latest + outputs: + pr_created: ${{ steps.check-pr.outputs.pr_created }} + pr_index: ${{ steps.create-pr.outputs.pr_index }} + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + # Step 1: Check for an existing PR + - name: Check if PR Exists + id: check-pr + uses: prasiman/gocurl@v1 + with: + url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.base_ref }}/${{ github.ref_name }} + method: "GET" + headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' + log-response: true + + - name: Evaluate Existing PR Status + id: eval-pr + run: | + echo "Checking if PR already exists..." + if [ "${{ steps.check-pr.outputs.response }}" = "[]" ]; then + echo "pr_exists=false" >> $GITHUB_ENV + echo "No existing PR found for branch." + else + echo "pr_exists=true" >> $GITHUB_ENV + echo "PR already exists. Continuing..." + fi + + # Step 2: Create PR if none exists + - name: Create PR in Gitea + if: env.pr_exists == 'false' + id: create-pr + uses: arifer612/Gitea-PR-action@v1.2.0 + with: + url: ${{ vars.RINOA_GITEA_URL }} + token: ${{ secrets.GITEA_API_TOKEN }}" + + # Job 2: Run SonarQube Analysis + sonarqube-analysis: + runs-on: ubuntu-latest + needs: check-and-create-pr + outputs: + quality_gate_status: ${{ steps.quality-gate.outputs.quality-gate-status }} + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + # Step 1: Run SonarQube Scan + - name: SonarQube Scan + uses: sonarsource/sonarqube-scan-action@v4.1.0 + env: + SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + + # Step 2: SonarQube Quality Gate Check + - name: SonarQube Quality Gate + id: quality-gate + uses: sonarsource/sonarqube-quality-gate-action@v1 + env: + SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + + - name: Log Quality Gate Result + run: | + echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" + + # Job 3: Merge PR if Quality Gate passes + merge-pr: + runs-on: ubuntu-latest + needs: [check-and-create-pr, sonarqube-analysis] + if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED' + steps: + - name: Merge PR in Gitea + uses: prasiman/gocurl@v1 + with: + url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}" + method: "POST" + headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }' + params: >- + { + "Do": "merge", + "delete_branch_after_merge": true, + "force_merge": true, + "merge_when_checks_succeed": true + } + + - name: Confirm Merge + run: echo "PR has been successfully merged into main." diff --git a/.gitea/workflows/docker-compose-pr-workflow.yml b/.gitea/workflows/docker-compose-pr-workflow.yml deleted file mode 100644 index db504a44..00000000 --- a/.gitea/workflows/docker-compose-pr-workflow.yml +++ /dev/null @@ -1,92 +0,0 @@ -name: Docker Compose PR Workflow - -on: - push: - branches: - - '*' - create: - branches: - - '*' - -jobs: - create-pr-and-validate: - name: Create PR and Validate Docker Compose - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: List PRs - id: listprs - uses: prasiman/gocurl@v1 - with: - url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls - params: '{ "state": "open" }' - method: "GET" - headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' - log-response: true - - name: Var test - run: | - echo ${{ steps.listprs.outputs.response }} - # - name: Parse Response - # uses: yakubique/json-utils@v1.8 - # with: - # input: ${{ steps.listprs.outputs.response }} - # action: "get" - # key: "data" - # - name: Create Pull Request - # if: - # uses: arifer612/Gitea-PR-action@v1.2.0 - # with: - # url: ${{ secrets.RINOA_GITEA_SERVER }} - # token: ${{ secrets.BOT_GITEA_TOKEN }} - - # - name: Run SonarQube Analysis - # uses: sonarsource/sonarqube-scan-action@v4.1.0 - # with: - # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - - # - name: Check SonarQube Quality Gate - # id: quality-gate - # uses: SonarSource/sonarqube-quality-gate-action@v1.1.0 - # with: - # SONARQUBE_HOST: ${{ secrets.SONARQUBE_HOST }} - # sonar_token: ${{ secrets.SONARQUBE_TOKEN }} - - # - name: Validate Docker Compose Configuration - # if: steps.quality-gate.outputs.quality-gate-status == 'PASSED' - # id: docker-lint - # run: | - # echo "${{ secrets.DOCKER_ENV }}" > .env - # docker compose config --no-interpolate --quiet --dry-run - - # - name: Merge Pull Request - # if: steps.docker-lint.outcome == 'success' - # uses: prasiman/gocurl@v1 - # with: - # url: ${{ secrets.GITEA_API_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ github.event.pull_request.number }}/merge - # method: "POST" - # log-response: true - # headers: | - # Authorization: token ${{ secrets.BOT_GITEA_TOKEN }} - # Content-Type: application/json - # body: | - # { - # "Do": "merge" - # } - - # deploy-main: - # name: Deploy to Remote Host - # needs: create-pr-and-validate - # if: github.ref == 'refs/heads/main' - # runs-on: ubuntu-latest - # steps: - # - name: SSH to Remote Host and Deploy Docker Compose - # uses: keatonLiu/docker-compose-remote-action@v1.2 - # with: - # ssh_user: gitea-deploy - # ssh_host: 192.168.1.254 - # ssh_private_key: ${{ secrets.DEPLOY_PRIVATE_SSH_KEY }} - # ssh_host_public_key: $ ${{ secrets.DEPLOY_PUBLIC_SSH_KEY }} - # compose_file_path: docker-compose.yml - # args: "-d --remove-orphans --build --dry-run" From f56611623214d53110a4ebd8c208fb7ed01a7cfd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 21:11:57 -0500 Subject: [PATCH 044/124] URL verification --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index dc98bf34..2c8eec24 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -19,6 +19,10 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 + - name: URL check + run: | + echo "URL: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.base_ref }}/${{ github.ref_name }}" + # Step 1: Check for an existing PR - name: Check if PR Exists id: check-pr From ed2fe1a8e1ac1007b8e642de24af3a94074c8354 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 21:15:16 -0500 Subject: [PATCH 045/124] YAML fix, L23. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 2c8eec24..ada2efdb 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: URL check - run: | + run: | echo "URL: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.base_ref }}/${{ github.ref_name }}" # Step 1: Check for an existing PR From 9be225c89e405f4a41713691e0cef0d9c663b02c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 21:44:41 -0500 Subject: [PATCH 046/124] Path fix on L31 for gocurl. --- .../workflows/branch-sonarscan-pr-merge.yml | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index ada2efdb..f34c0ddd 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -28,22 +28,35 @@ jobs: id: check-pr uses: prasiman/gocurl@v1 with: - url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.base_ref }}/${{ github.ref_name }} + url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} method: "GET" headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' + accept: 200,201,204,404 log-response: true - - name: Evaluate Existing PR Status - id: eval-pr + - name: Convert gocurl Response to JSON + id: preprocess-response run: | - echo "Checking if PR already exists..." - if [ "${{ steps.check-pr.outputs.response }}" = "[]" ]; then - echo "pr_exists=false" >> $GITHUB_ENV - echo "No existing PR found for branch." - else - echo "pr_exists=true" >> $GITHUB_ENV - echo "PR already exists. Continuing..." - fi + RESPONSE='${{ steps.check-pr.outputs.response }}' + + # Extract the 'data' and 'status_code' fields into JSON format + DATA=$(echo "$RESPONSE" | grep -oP 'data:\K[^\s]+' || echo "null") + STATUS_CODE=$(echo "$RESPONSE" | grep -oP 'status_code:\K[^\s]+' || echo "0") + + # Create valid JSON output + echo "{ \"data\": $DATA, \"status_code\": $STATUS_CODE }" > response.json + cat response.json + + # Export as output + echo "response_json=$(cat response.json)" >> $GITHUB_OUTPUT + + - name: Parse PR Response + id: parse-pr + uses: yakubique/json-utils@v1.8 + with: + input: ${{ steps.preprocess-response.outputs.response_json }} + action: "get" + key: "" # Step 2: Create PR if none exists - name: Create PR in Gitea From 9083db6bf0ea823b6db66f9978fe553656e0836e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 21:49:38 -0500 Subject: [PATCH 047/124] JSON pre-processing tweaks. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index f34c0ddd..5c5f82d3 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -34,21 +34,19 @@ jobs: accept: 200,201,204,404 log-response: true - - name: Convert gocurl Response to JSON - id: preprocess-response + - name: Extract gocurl Response to Valid JSON + id: extract-json run: | RESPONSE='${{ steps.check-pr.outputs.response }}' - # Extract the 'data' and 'status_code' fields into JSON format - DATA=$(echo "$RESPONSE" | grep -oP 'data:\K[^\s]+' || echo "null") - STATUS_CODE=$(echo "$RESPONSE" | grep -oP 'status_code:\K[^\s]+' || echo "0") + # Extract only the JSON content starting with '{' and ending with '}' + JSON_RESPONSE=$(echo "$RESPONSE" | grep -oP '\{.*\}' || echo '{}') - # Create valid JSON output - echo "{ \"data\": $DATA, \"status_code\": $STATUS_CODE }" > response.json - cat response.json + # Validate the JSON using jq + echo "$JSON_RESPONSE" | jq '.' > valid_response.json || echo '{}' > valid_response.json - # Export as output - echo "response_json=$(cat response.json)" >> $GITHUB_OUTPUT + # Output the validated JSON + echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT - name: Parse PR Response id: parse-pr From 65d72d10c2f39272ba0c4e1bf4ad316fd473a947 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 21:55:16 -0500 Subject: [PATCH 048/124] JSON pre-processing tweaks. --- .../workflows/branch-sonarscan-pr-merge.yml | 99 ++++++++++--------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 5c5f82d3..30df7bad 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -54,65 +54,68 @@ jobs: with: input: ${{ steps.preprocess-response.outputs.response_json }} action: "get" - key: "" + key: "status" + - name: json-utils output + run: | + echo "${{ steps.parse-pr.outputs.result }}" # Step 2: Create PR if none exists - name: Create PR in Gitea - if: env.pr_exists == 'false' + if: ${{ steps.parse-pr.outputs.status == '404' }} id: create-pr uses: arifer612/Gitea-PR-action@v1.2.0 with: url: ${{ vars.RINOA_GITEA_URL }} token: ${{ secrets.GITEA_API_TOKEN }}" - # Job 2: Run SonarQube Analysis - sonarqube-analysis: - runs-on: ubuntu-latest - needs: check-and-create-pr - outputs: - quality_gate_status: ${{ steps.quality-gate.outputs.quality-gate-status }} - steps: - - name: Checkout Code - uses: actions/checkout@v4 + # # Job 2: Run SonarQube Analysis + # sonarqube-analysis: + # runs-on: ubuntu-latest + # needs: check-and-create-pr + # outputs: + # quality_gate_status: ${{ steps.quality-gate.outputs.quality-gate-status }} + # steps: + # - name: Checkout Code + # uses: actions/checkout@v4 - # Step 1: Run SonarQube Scan - - name: SonarQube Scan - uses: sonarsource/sonarqube-scan-action@v4.1.0 - env: - SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} - SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + # # Step 1: Run SonarQube Scan + # - name: SonarQube Scan + # uses: sonarsource/sonarqube-scan-action@v4.1.0 + # env: + # SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + # SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - # Step 2: SonarQube Quality Gate Check - - name: SonarQube Quality Gate - id: quality-gate - uses: sonarsource/sonarqube-quality-gate-action@v1 - env: - SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} - SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + # # Step 2: SonarQube Quality Gate Check + # - name: SonarQube Quality Gate + # id: quality-gate + # uses: sonarsource/sonarqube-quality-gate-action@v1 + # env: + # SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + # SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - - name: Log Quality Gate Result - run: | - echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" + # - name: Log Quality Gate Result + # run: | + # echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" - # Job 3: Merge PR if Quality Gate passes - merge-pr: - runs-on: ubuntu-latest - needs: [check-and-create-pr, sonarqube-analysis] - if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED' - steps: - - name: Merge PR in Gitea - uses: prasiman/gocurl@v1 - with: - url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}" - method: "POST" - headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }' - params: >- - { - "Do": "merge", - "delete_branch_after_merge": true, - "force_merge": true, - "merge_when_checks_succeed": true - } + # # Job 3: Merge PR if Quality Gate passes + # merge-pr: + # runs-on: ubuntu-latest + # needs: [check-and-create-pr, sonarqube-analysis] + # if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED' + # steps: + # - name: Merge PR in Gitea + # uses: prasiman/gocurl@v1 + # with: + # url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}" + # method: "POST" + # headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }' + # params: >- + # { + # "Do": "merge", + # "delete_branch_after_merge": true, + # "force_merge": true, + # "merge_when_checks_succeed": true + # } - - name: Confirm Merge - run: echo "PR has been successfully merged into main." + # - name: Confirm Merge + # run: echo "PR has been successfully merged into main." From f56cf9bf6c32e9e78176c06e04ecf7cb853e1d6b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 21:57:19 -0500 Subject: [PATCH 049/124] ref fix L51. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 30df7bad..350f37e1 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -19,10 +19,6 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - - name: URL check - run: | - echo "URL: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.base_ref }}/${{ github.ref_name }}" - # Step 1: Check for an existing PR - name: Check if PR Exists id: check-pr @@ -52,7 +48,7 @@ jobs: id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.preprocess-response.outputs.response_json }} + input: ${{ steps.extract-json.outputs.response_json }} action: "get" key: "status" From fc2f376a1915664d9e8918cbe4a9cd5acf7fb54c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:01:35 -0500 Subject: [PATCH 050/124] ref fix L51. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 350f37e1..f4ebe283 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -44,6 +44,10 @@ jobs: # Output the validated JSON echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT + - name: json-utils output + run: | + echo "${{ steps.parse-pr.outputs.result }}" + - name: Parse PR Response id: parse-pr uses: yakubique/json-utils@v1.8 @@ -52,9 +56,6 @@ jobs: action: "get" key: "status" - - name: json-utils output - run: | - echo "${{ steps.parse-pr.outputs.result }}" # Step 2: Create PR if none exists - name: Create PR in Gitea if: ${{ steps.parse-pr.outputs.status == '404' }} From a10ca0f957c28efe30914a8957496c34b90bfd83 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:02:25 -0500 Subject: [PATCH 051/124] ref fix L51. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index f4ebe283..653505cf 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -46,7 +46,8 @@ jobs: - name: json-utils output run: | - echo "${{ steps.parse-pr.outputs.result }}" + echo "${{ steps.extract-json.outputs.response_json }}" + echo "${{ steps.extract-json.outputs.response_json }}" | jq '.' - name: Parse PR Response id: parse-pr From e72fe884dd4be308981e930b13f11b923dd39572 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:10:10 -0500 Subject: [PATCH 052/124] json-utils tweaking... (sleep cometh soon) --- .../workflows/branch-sonarscan-pr-merge.yml | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 653505cf..7fe7b12a 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -30,41 +30,22 @@ jobs: accept: 200,201,204,404 log-response: true - - name: Extract gocurl Response to Valid JSON - id: extract-json - run: | - RESPONSE='${{ steps.check-pr.outputs.response }}' - - # Extract only the JSON content starting with '{' and ending with '}' - JSON_RESPONSE=$(echo "$RESPONSE" | grep -oP '\{.*\}' || echo '{}') - - # Validate the JSON using jq - echo "$JSON_RESPONSE" | jq '.' > valid_response.json || echo '{}' > valid_response.json - - # Output the validated JSON - echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT - - - name: json-utils output - run: | - echo "${{ steps.extract-json.outputs.response_json }}" - echo "${{ steps.extract-json.outputs.response_json }}" | jq '.' - - name: Parse PR Response id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.extract-json.outputs.response_json }} + input: ${{ steps.check-pr.outputs.response }} action: "get" key: "status" # Step 2: Create PR if none exists - - name: Create PR in Gitea - if: ${{ steps.parse-pr.outputs.status == '404' }} - id: create-pr - uses: arifer612/Gitea-PR-action@v1.2.0 - with: - url: ${{ vars.RINOA_GITEA_URL }} - token: ${{ secrets.GITEA_API_TOKEN }}" + # - name: Create PR in Gitea + # if: ${{ steps.parse-pr.outputs.status == '404' }} + # id: create-pr + # uses: arifer612/Gitea-PR-action@v1.2.0 + # with: + # url: ${{ vars.RINOA_GITEA_URL }} + # token: ${{ secrets.GITEA_API_TOKEN }}" # # Job 2: Run SonarQube Analysis # sonarqube-analysis: From 3986c8912d8317d013b4227bcaa5b9885551a820 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:14:19 -0500 Subject: [PATCH 053/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 7fe7b12a..f859173e 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -34,9 +34,8 @@ jobs: id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.check-pr.outputs.response }} - action: "get" - key: "status" + input: ${{ steps.check-pr.outputs.response.status }} + action: "none" # Step 2: Create PR if none exists # - name: Create PR in Gitea From 6989b2adf78b5326791dbb7d2f41355d589bb963 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:20:20 -0500 Subject: [PATCH 054/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index f859173e..7a50d41e 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -30,6 +30,10 @@ jobs: accept: 200,201,204,404 log-response: true + - name: Format of gocurl response. + run: | + echo "${{ steps.check-pr.outputs.response }}" + - name: Parse PR Response id: parse-pr uses: yakubique/json-utils@v1.8 From f0cbb7256998467fe246e0ccefcd1a8cd8b74195 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:21:30 -0500 Subject: [PATCH 055/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 7a50d41e..371cff68 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -31,8 +31,8 @@ jobs: log-response: true - name: Format of gocurl response. - run: | - echo "${{ steps.check-pr.outputs.response }}" + run: | + echo "${{ steps.check-pr.outputs.response }}" - name: Parse PR Response id: parse-pr From 0da1eee75e92fab14a92f9488146b96557d55803 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:23:38 -0500 Subject: [PATCH 056/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 371cff68..ece17edb 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.outputs.response }}" + echo "${{ steps.check-pr.outputs.response }}" | jq - name: Parse PR Response id: parse-pr From e332f565688e68d0cfa19f8866bceadb9538d86c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:26:26 -0500 Subject: [PATCH 057/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index ece17edb..3fceabfe 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.outputs.response }}" | jq + echo "${{ steps.check-pr.outputs.response.status }}" | jq - name: Parse PR Response id: parse-pr From 45e732b5473b4b746056c393e5c4892b0476ce23 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:38:50 -0500 Subject: [PATCH 058/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 3fceabfe..d027e0ab 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.outputs.response.status }}" | jq + echo "${{ steps.check-pr.outputs.response.status }}" - name: Parse PR Response id: parse-pr From 797aa544899529384620a0ae352e69d9ad8f74da Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:43:35 -0500 Subject: [PATCH 059/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index d027e0ab..ef0f96f2 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -26,7 +26,7 @@ jobs: with: url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} method: "GET" - headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" }' + headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" , "Accept": "application/json" }' accept: 200,201,204,404 log-response: true From a58e46b3a02b6794fb93bd8b2415b82d8c8611fc Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:45:10 -0500 Subject: [PATCH 060/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index ef0f96f2..4c1b9251 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.outputs.response.status }}" + echo "${{ steps.check-pr.outputs.response }}" - name: Parse PR Response id: parse-pr From 99c110c06e3af5d854ecb7158a50b4bf8f2847c7 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:46:41 -0500 Subject: [PATCH 061/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 4c1b9251..d09db965 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.outputs.response }}" + echo "${{ steps.check-pr.outputs }}" - name: Parse PR Response id: parse-pr From c911d1761404087e41a80841c4891f889f993e62 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:48:07 -0500 Subject: [PATCH 062/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index d09db965..cefa3aa5 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.outputs }}" + echo "${{ steps.check-pr.response.status }}" - name: Parse PR Response id: parse-pr From d3895342ed1f3be8901d28da13dca7b5a6cf276f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Dec 2024 22:49:27 -0500 Subject: [PATCH 063/124] json-utils tweaking... (sleep cometh soon) --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index cefa3aa5..19765b90 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.response.status }}" + echo "${{ steps.check-pr.response['status'] }}" - name: Parse PR Response id: parse-pr From 39ef9d7cf0d29912d6f51507e793b2daf6e8d812 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:06:24 -0500 Subject: [PATCH 064/124] Debugging output from gocurl. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 19765b90..2bb82e4e 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo "${{ steps.check-pr.response['status'] }}" + echo ${{ steps.check-pr.outputs }} - name: Parse PR Response id: parse-pr From d9ca5d6883d273c29555711db4bc8a2c77dbd251 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:10:33 -0500 Subject: [PATCH 065/124] Debugging output from gocurl. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 2bb82e4e..9c9881e7 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo ${{ steps.check-pr.outputs }} + echo '${{ toJSON(steps.check-pr.outputs.response) }}'' - name: Parse PR Response id: parse-pr From 3c2c48555178154cd848af717927662572c29ad9 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:11:27 -0500 Subject: [PATCH 066/124] Debugging output from gocurl. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 9c9881e7..5d98b55e 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: - name: Format of gocurl response. run: | - echo '${{ toJSON(steps.check-pr.outputs.response) }}'' + echo '${{ toJSON(steps.check-pr.outputs.response) }}' - name: Parse PR Response id: parse-pr From aefebae5612df48ca1aa980169dd03bc6ff1e0cd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:12:55 -0500 Subject: [PATCH 067/124] Debugging output from gocurl (addeed toJSON). --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 5d98b55e..5eace7e5 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -38,7 +38,7 @@ jobs: id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.check-pr.outputs.response.status }} + input: '${{ toJSON(steps.check-pr.outputs.response) }}' action: "none" # Step 2: Create PR if none exists From b8f142c3e81c4c957e8cb1b010a5d84b4074d14e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:16:27 -0500 Subject: [PATCH 068/124] Debugging output from json-util's get function. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 5eace7e5..59bd58d6 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -39,7 +39,12 @@ jobs: uses: yakubique/json-utils@v1.8 with: input: '${{ toJSON(steps.check-pr.outputs.response) }}' - action: "none" + action: "get" + key: "status" + + - name: View output from json-utils + run: | + echo '${{ steps.parse-pr.outputs.status }}' # Step 2: Create PR if none exists # - name: Create PR in Gitea From 04f433df59a4baffd97fae90876e541b863a8092 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:27:20 -0500 Subject: [PATCH 069/124] Debugging json-util's get function. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 59bd58d6..53a62a6c 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -34,18 +34,21 @@ jobs: run: | echo '${{ toJSON(steps.check-pr.outputs.response) }}' + - name: Extract gocurl Response to Valid JSON + id: extract-json + run: | + RESPONSE='${{ toJSON(steps.check-pr.outputs.response) }}' + echo "$RESPONSE" | jq '.' > valid_response.json + echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT + - name: Parse PR Response id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: '${{ toJSON(steps.check-pr.outputs.response) }}' + input: '${{ steps.extract-json.outputs.response_json }}' action: "get" key: "status" - - name: View output from json-utils - run: | - echo '${{ steps.parse-pr.outputs.status }}' - # Step 2: Create PR if none exists # - name: Create PR in Gitea # if: ${{ steps.parse-pr.outputs.status == '404' }} From ebfcb6162e04fc20d68bc339b99f15fbbe4d0ed5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:33:52 -0500 Subject: [PATCH 070/124] Debugging json-util's get function. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 53a62a6c..24f3a990 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -39,6 +39,7 @@ jobs: run: | RESPONSE='${{ toJSON(steps.check-pr.outputs.response) }}' echo "$RESPONSE" | jq '.' > valid_response.json + cat valid_repsponse.json echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT - name: Parse PR Response From 7b1d148ad9a642f5a3205e0f0d4cd9d21b5b0f2d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:35:29 -0500 Subject: [PATCH 071/124] Typo fixes. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 24f3a990..1038e327 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -39,7 +39,7 @@ jobs: run: | RESPONSE='${{ toJSON(steps.check-pr.outputs.response) }}' echo "$RESPONSE" | jq '.' > valid_response.json - cat valid_repsponse.json + cat valid_response.json echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT - name: Parse PR Response From 4707211c83bb6fdb37e653126e5754a79657b5e6 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:37:06 -0500 Subject: [PATCH 072/124] Typo fixes. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 1038e327..5a6b0e98 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -38,8 +38,8 @@ jobs: id: extract-json run: | RESPONSE='${{ toJSON(steps.check-pr.outputs.response) }}' - echo "$RESPONSE" | jq '.' > valid_response.json - cat valid_response.json + echo "$RESPONSE" > valid_response.json + cat valid_response.json | jq echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT - name: Parse PR Response From 3e851aaa4e4f26796fa2c40c1d94d8cbb7c48d81 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:42:01 -0500 Subject: [PATCH 073/124] Testing with fromJSON. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 5a6b0e98..6d0b6e67 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -30,23 +30,11 @@ jobs: accept: 200,201,204,404 log-response: true - - name: Format of gocurl response. - run: | - echo '${{ toJSON(steps.check-pr.outputs.response) }}' - - - name: Extract gocurl Response to Valid JSON - id: extract-json - run: | - RESPONSE='${{ toJSON(steps.check-pr.outputs.response) }}' - echo "$RESPONSE" > valid_response.json - cat valid_response.json | jq - echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT - - name: Parse PR Response id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: '${{ steps.extract-json.outputs.response_json }}' + input: '${{ fromJSON(steps.check-pr.outputs.response) }}' action: "get" key: "status" From 3c46bdcde8e9695a7a5b196086522fc3c9a99082 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:49:10 -0500 Subject: [PATCH 074/124] Testing with fromJSON. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 6d0b6e67..444c0c26 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -30,11 +30,18 @@ jobs: accept: 200,201,204,404 log-response: true + - name: Format of gocurl response. + id: format-response + run: | + RESPONSE='${{ toJSON(steps.check-pr.outputs.response) }}' + echo "$RESPONSE" | jq > valid_response.json + echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT + - name: Parse PR Response id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: '${{ fromJSON(steps.check-pr.outputs.response) }}' + input: '${{ fromJSON(steps.format-response.outputs.response_json) }}' action: "get" key: "status" From 62db1e73255ab32a5d7cef49a8cc13f041fd4011 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 08:50:29 -0500 Subject: [PATCH 075/124] Removing fromJSON for now. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 444c0c26..e7b07276 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -41,7 +41,7 @@ jobs: id: parse-pr uses: yakubique/json-utils@v1.8 with: - input: '${{ fromJSON(steps.format-response.outputs.response_json) }}' + input: '${{ steps.format-response.outputs.response_json }}' action: "get" key: "status" From 6a1ff894fe2a9732a8552b801c5192ec6660f062 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 09:21:07 -0500 Subject: [PATCH 076/124] So much for reusability... sigh. If it works, it works. --- .../workflows/branch-sonarscan-pr-merge.yml | 44 +++++++------------ 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index e7b07276..e5f61532 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -22,37 +22,25 @@ jobs: # Step 1: Check for an existing PR - name: Check if PR Exists id: check-pr - uses: prasiman/gocurl@v1 - with: - url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} - method: "GET" - headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" , "Accept": "application/json" }' - accept: 200,201,204,404 - log-response: true - - - name: Format of gocurl response. - id: format-response run: | - RESPONSE='${{ toJSON(steps.check-pr.outputs.response) }}' - echo "$RESPONSE" | jq > valid_response.json - echo "response_json=$(cat valid_response.json)" >> $GITHUB_OUTPUT + pr_http_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -w "%{http_code}" -s -o /dev/null) + echo "pr_http_status=$pr_http_status" >> $GITHUB_OUTPUT + # uses: prasiman/gocurl@v1 + # with: + # url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} + # method: "GET" + # headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" , "Accept": "application/json" }' + # accept: 200,201,204,404 + # log-response: true - - name: Parse PR Response - id: parse-pr - uses: yakubique/json-utils@v1.8 + Step 2: Create PR if none exists + - name: Create PR in Gitea + if: ${{ steps.check_pr.outputs.pr_http_status == '404' }} + id: create-pr + uses: arifer612/Gitea-PR-action@v1.2.0 with: - input: '${{ steps.format-response.outputs.response_json }}' - action: "get" - key: "status" - - # Step 2: Create PR if none exists - # - name: Create PR in Gitea - # if: ${{ steps.parse-pr.outputs.status == '404' }} - # id: create-pr - # uses: arifer612/Gitea-PR-action@v1.2.0 - # with: - # url: ${{ vars.RINOA_GITEA_URL }} - # token: ${{ secrets.GITEA_API_TOKEN }}" + url: ${{ vars.RINOA_GITEA_URL }} + token: ${{ secrets.GITEA_API_TOKEN }} # # Job 2: Run SonarQube Analysis # sonarqube-analysis: From 4cd4bf45b358bafb8a2e1403ce6873969c531263 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 09:22:17 -0500 Subject: [PATCH 077/124] Commented out L22 (need more chai)... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index e5f61532..c16b64bb 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -33,7 +33,7 @@ jobs: # accept: 200,201,204,404 # log-response: true - Step 2: Create PR if none exists + # Step 2: Create PR if none exists - name: Create PR in Gitea if: ${{ steps.check_pr.outputs.pr_http_status == '404' }} id: create-pr From 0d3f32be71ac53838efccf8d6c96ca5a11469e1c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 09:24:19 -0500 Subject: [PATCH 078/124] Echo debugging ftw, lulz... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index c16b64bb..55f352a3 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,6 +32,9 @@ jobs: # headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" , "Accept": "application/json" }' # accept: 200,201,204,404 # log-response: true + - name: Var test + run: | + echo "pr_http_status: ${{ steps.check-pr.outputs.pr_http_status }}" # Step 2: Create PR if none exists - name: Create PR in Gitea From 81b81845f9161660686bf8acb5a650f664bad753 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:14:20 -0500 Subject: [PATCH 079/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 55f352a3..ab04b3a0 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -11,6 +11,7 @@ on: jobs: # Job 1: Check if PR exists and create one if the branch is new check-and-create-pr: + name: Check and Create PR runs-on: ubuntu-latest outputs: pr_created: ${{ steps.check-pr.outputs.pr_created }} @@ -25,25 +26,16 @@ jobs: run: | pr_http_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -w "%{http_code}" -s -o /dev/null) echo "pr_http_status=$pr_http_status" >> $GITHUB_OUTPUT - # uses: prasiman/gocurl@v1 - # with: - # url: ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} - # method: "GET" - # headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}" , "Accept": "application/json" }' - # accept: 200,201,204,404 - # log-response: true - - name: Var test - run: | - echo "pr_http_status: ${{ steps.check-pr.outputs.pr_http_status }}" # Step 2: Create PR if none exists - name: Create PR in Gitea - if: ${{ steps.check_pr.outputs.pr_http_status == '404' }} + if: steps.check_pr.outputs.pr_http_status == '404' id: create-pr uses: arifer612/Gitea-PR-action@v1.2.0 with: url: ${{ vars.RINOA_GITEA_URL }} - token: ${{ secrets.GITEA_API_TOKEN }} + token: ${{ secrets.BOT_GITEA_TOKEN }} + assignee: ${{ github.actor }} # # Job 2: Run SonarQube Analysis # sonarqube-analysis: From 2d3213fd4276f7df9b1eb0ce187080a82da27d2f Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:40:47 -0500 Subject: [PATCH 080/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index ab04b3a0..98d8bd6c 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -24,12 +24,13 @@ jobs: - name: Check if PR Exists id: check-pr run: | - pr_http_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -w "%{http_code}" -s -o /dev/null) + echo "Checking for existing PR..." + pr_http_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' | jq '{index: .number, state: .state}') echo "pr_http_status=$pr_http_status" >> $GITHUB_OUTPUT # Step 2: Create PR if none exists - name: Create PR in Gitea - if: steps.check_pr.outputs.pr_http_status == '404' + if: steps.check-pr.outputs.pr_http_status.state == 'closed' id: create-pr uses: arifer612/Gitea-PR-action@v1.2.0 with: From cc38d579f237f7a1975d9d8dd925df92fe319e20 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:45:08 -0500 Subject: [PATCH 081/124] Logic testing for PR creation. --- .../workflows/branch-sonarscan-pr-merge.yml | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 98d8bd6c..be743247 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -25,18 +25,25 @@ jobs: id: check-pr run: | echo "Checking for existing PR..." - pr_http_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' | jq '{index: .number, state: .state}') + pr_http_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') echo "pr_http_status=$pr_http_status" >> $GITHUB_OUTPUT - # Step 2: Create PR if none exists - - name: Create PR in Gitea - if: steps.check-pr.outputs.pr_http_status.state == 'closed' - id: create-pr - uses: arifer612/Gitea-PR-action@v1.2.0 + - name: Get PR status + id: get-pr-status + uses: yakubique/json-utils@v1.8 with: - url: ${{ vars.RINOA_GITEA_URL }} - token: ${{ secrets.BOT_GITEA_TOKEN }} - assignee: ${{ github.actor }} + input: ${{ steps.check-pr.outputs.pr_http_status }} + action: "get" + key: "state" + # Step 2: Create PR if none exists + # - name: Create PR in Gitea + # if: steps.check-pr.outputs.pr_http_status.state == 'closed' + # id: create-pr + # uses: arifer612/Gitea-PR-action@v1.2.0 + # with: + # url: ${{ vars.RINOA_GITEA_URL }} + # token: ${{ secrets.BOT_GITEA_TOKEN }} + # assignee: ${{ github.actor }} # # Job 2: Run SonarQube Analysis # sonarqube-analysis: From 999641aa055f44abdf5506f3f6e3e91882cb4e30 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:47:11 -0500 Subject: [PATCH 082/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index be743247..70c6c4e4 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: id: get-pr-status uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.check-pr.outputs.pr_http_status }} + input: '${{ steps.check-pr.outputs.pr_http_status }}' action: "get" key: "state" # Step 2: Create PR if none exists From 96c03848c9eee7618e94e59b43541cde09ea425e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:49:12 -0500 Subject: [PATCH 083/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 70c6c4e4..6005b41b 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -25,9 +25,13 @@ jobs: id: check-pr run: | echo "Checking for existing PR..." - pr_http_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') + pr_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') echo "pr_http_status=$pr_http_status" >> $GITHUB_OUTPUT + - name: var test + run: | + echo "pr_http_status: ${{ steps.check-pr.outputs.pr_http_status }}" + - name: Get PR status id: get-pr-status uses: yakubique/json-utils@v1.8 From 78a94b39049ad54ba1a494b6c6914aaf6a4e7ed5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:50:28 -0500 Subject: [PATCH 084/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 6005b41b..c946928d 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -26,17 +26,17 @@ jobs: run: | echo "Checking for existing PR..." pr_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') - echo "pr_http_status=$pr_http_status" >> $GITHUB_OUTPUT + echo "pr_status=$pr_status" >> $GITHUB_OUTPUT - name: var test run: | - echo "pr_http_status: ${{ steps.check-pr.outputs.pr_http_status }}" + echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" - name: Get PR status id: get-pr-status uses: yakubique/json-utils@v1.8 with: - input: '${{ steps.check-pr.outputs.pr_http_status }}' + input: '${{ steps.check-pr.outputs.pr_status }}' action: "get" key: "state" # Step 2: Create PR if none exists From 7fbbeefb8b95fc631c7290d7b4ba4d14ae68e538 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:55:47 -0500 Subject: [PATCH 085/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index c946928d..24776ab9 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -25,12 +25,11 @@ jobs: id: check-pr run: | echo "Checking for existing PR..." - pr_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') - echo "pr_status=$pr_status" >> $GITHUB_OUTPUT + curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') - - name: var test - run: | - echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" + # - name: var test + # run: | + # echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" - name: Get PR status id: get-pr-status From b308a4b17ebc654ebf3c9711af2eed7003e3ab7c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 11:56:42 -0500 Subject: [PATCH 086/124] Typo fix, L28 --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 24776ab9..4a56c2ed 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -25,7 +25,7 @@ jobs: id: check-pr run: | echo "Checking for existing PR..." - curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') + curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}' # - name: var test # run: | From 65b38b58b6cb75397f3583b74431cc64613824b1 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:00:01 -0500 Subject: [PATCH 087/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 4a56c2ed..9552c215 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -25,17 +25,14 @@ jobs: id: check-pr run: | echo "Checking for existing PR..." - curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}' - - # - name: var test - # run: | - # echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" + pr_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') + echo "pr_status=$pr_status" >> $GITHUB_OUTPUT - name: Get PR status id: get-pr-status uses: yakubique/json-utils@v1.8 with: - input: '${{ steps.check-pr.outputs.pr_status }}' + input: ${{ steps.check-pr.outputs.pr_status }} action: "get" key: "state" # Step 2: Create PR if none exists From 84a38744f7afd63a8bfb724d2c7cd21270b22e25 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:01:08 -0500 Subject: [PATCH 088/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 9552c215..52257da3 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: id: get-pr-status uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.check-pr.outputs.pr_status }} + input: '${{ steps.check-pr.outputs.pr_status }}' action: "get" key: "state" # Step 2: Create PR if none exists From 8decd85f666a428434dd534184a1f547fd623410 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:02:10 -0500 Subject: [PATCH 089/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 52257da3..9552c215 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -32,7 +32,7 @@ jobs: id: get-pr-status uses: yakubique/json-utils@v1.8 with: - input: '${{ steps.check-pr.outputs.pr_status }}' + input: ${{ steps.check-pr.outputs.pr_status }} action: "get" key: "state" # Step 2: Create PR if none exists From 5edeebd6e37eedec7320a779720b8b2d8ebd2975 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:05:29 -0500 Subject: [PATCH 090/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 9552c215..262e9704 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -28,11 +28,15 @@ jobs: pr_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') echo "pr_status=$pr_status" >> $GITHUB_OUTPUT + - name: var test + run: | + echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" + - name: Get PR status id: get-pr-status uses: yakubique/json-utils@v1.8 with: - input: ${{ steps.check-pr.outputs.pr_status }} + input: '${{ toJSON(steps.check-pr.outputs.pr_status) }}' action: "get" key: "state" # Step 2: Create PR if none exists From d36d4927f6424a4440602aa075191ee5953a8a48 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:07:59 -0500 Subject: [PATCH 091/124] Logic testing for PR creation. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 262e9704..c61b8c0d 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -25,8 +25,9 @@ jobs: id: check-pr run: | echo "Checking for existing PR..." - pr_status=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}') - echo "pr_status=$pr_status" >> $GITHUB_OUTPUT + curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}' > pr_status.json + cat pr_status.json + echo "pr_status=$(cat pr_status.json)" >> $GITHUB_OUTPUT - name: var test run: | From 1f9ee7b47baa5a9723c3d8bf0ca36fcbe4907bcb Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:33:23 -0500 Subject: [PATCH 092/124] Logic testing for PR creation. --- .../workflows/branch-sonarscan-pr-merge.yml | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index c61b8c0d..209d2f84 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -20,26 +20,32 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - # Step 1: Check for an existing PR - name: Check if PR Exists id: check-pr run: | echo "Checking for existing PR..." - curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} -X 'GET' -H 'Accept: application/json' -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' -s | jq '{index: .number, state: .state}' > pr_status.json + curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} \ + -X 'GET' \ + -H 'Accept: application/json' \ + -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \ + -s | jq '{index: .number, state: .state}' > pr_status.json + cat pr_status.json - echo "pr_status=$(cat pr_status.json)" >> $GITHUB_OUTPUT + echo "pr_status=$(jq -c . pr_status.json)" >> "$GITHUB_OUTPUT" - name: var test run: | - echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" + echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" - - name: Get PR status - id: get-pr-status - uses: yakubique/json-utils@v1.8 - with: - input: '${{ toJSON(steps.check-pr.outputs.pr_status) }}' - action: "get" - key: "state" + + + # - name: Get PR status + # id: get-pr-status + # uses: yakubique/json-utils@v1.8 + # with: + # input: '${{ toJSON(steps.check-pr.outputs.pr_status) }}' + # action: "get" + # key: "state" # Step 2: Create PR if none exists # - name: Create PR in Gitea # if: steps.check-pr.outputs.pr_http_status.state == 'closed' From 634430a60b3fd551e1129b8dc8d11fba5e1fbe0c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:36:00 -0500 Subject: [PATCH 093/124] Passing response appears to be fixed. --- .../workflows/branch-sonarscan-pr-merge.yml | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 209d2f84..6228fad4 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -33,19 +33,17 @@ jobs: cat pr_status.json echo "pr_status=$(jq -c . pr_status.json)" >> "$GITHUB_OUTPUT" - - name: var test - run: | - echo "pr_status: ${{ steps.check-pr.outputs.pr_status }}" + - name: Status check + if: ${{ steps.check-pr.outputs.pr_status.state == 'closed' }} + run: echo "PR is closed, creating a new one..." - - - # - name: Get PR status - # id: get-pr-status - # uses: yakubique/json-utils@v1.8 - # with: - # input: '${{ toJSON(steps.check-pr.outputs.pr_status) }}' - # action: "get" - # key: "state" + - name: Get PR status + id: get-pr-status + uses: yakubique/json-utils@v1.8 + with: + input: '${{ toJSON(steps.check-pr.outputs.pr_status) }}' + action: "get" + key: "state" # Step 2: Create PR if none exists # - name: Create PR in Gitea # if: steps.check-pr.outputs.pr_http_status.state == 'closed' From 3cddf972efbf1c5798d02fb161b6a82353d3b1bb Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:37:04 -0500 Subject: [PATCH 094/124] Conditional testing. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 6228fad4..a838f217 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -34,7 +34,7 @@ jobs: echo "pr_status=$(jq -c . pr_status.json)" >> "$GITHUB_OUTPUT" - name: Status check - if: ${{ steps.check-pr.outputs.pr_status.state == 'closed' }} + if: ${{ steps.check-pr.outputs.pr_status.state }} == 'closed' run: echo "PR is closed, creating a new one..." - name: Get PR status From 84ec8a115f240de3ca1f5f0023666c4a23412295 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 12:40:46 -0500 Subject: [PATCH 095/124] Conditional testing for PR creation. --- .../workflows/branch-sonarscan-pr-merge.yml | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index a838f217..d97b234c 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -29,30 +29,16 @@ jobs: -H 'Accept: application/json' \ -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \ -s | jq '{index: .number, state: .state}' > pr_status.json - - cat pr_status.json echo "pr_status=$(jq -c . pr_status.json)" >> "$GITHUB_OUTPUT" - - name: Status check + - name: Create PR in Gitea if: ${{ steps.check-pr.outputs.pr_status.state }} == 'closed' - run: echo "PR is closed, creating a new one..." - - - name: Get PR status - id: get-pr-status - uses: yakubique/json-utils@v1.8 + id: create-pr + uses: arifer612/Gitea-PR-action@v1.2.0 with: - input: '${{ toJSON(steps.check-pr.outputs.pr_status) }}' - action: "get" - key: "state" - # Step 2: Create PR if none exists - # - name: Create PR in Gitea - # if: steps.check-pr.outputs.pr_http_status.state == 'closed' - # id: create-pr - # uses: arifer612/Gitea-PR-action@v1.2.0 - # with: - # url: ${{ vars.RINOA_GITEA_URL }} - # token: ${{ secrets.BOT_GITEA_TOKEN }} - # assignee: ${{ github.actor }} + url: ${{ vars.RINOA_GITEA_URL }} + token: ${{ secrets.BOT_GITEA_TOKEN }} + assignee: ${{ github.actor }} # # Job 2: Run SonarQube Analysis # sonarqube-analysis: From 8fc6f9a4fb425674ae529009e25ef473dc331e27 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 13:11:10 -0500 Subject: [PATCH 096/124] Tweaking PR creation... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index d97b234c..186db13c 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -38,7 +38,6 @@ jobs: with: url: ${{ vars.RINOA_GITEA_URL }} token: ${{ secrets.BOT_GITEA_TOKEN }} - assignee: ${{ github.actor }} # # Job 2: Run SonarQube Analysis # sonarqube-analysis: From 8d8e3f3584cc1e7ce04b887e3e8c7ba019a9e980 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 13:26:38 -0500 Subject: [PATCH 097/124] Reverting from gitea-pr-action to curl. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 186db13c..294230a5 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -34,10 +34,20 @@ jobs: - name: Create PR in Gitea if: ${{ steps.check-pr.outputs.pr_status.state }} == 'closed' id: create-pr - uses: arifer612/Gitea-PR-action@v1.2.0 - with: - url: ${{ vars.RINOA_GITEA_URL }} - token: ${{ secrets.BOT_GITEA_TOKEN }} + run: | + echo "Creating PR..." + curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls \ + -X 'POST' \ + -H 'Accept: application/json' \ + -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \ + -H 'Content-Type: application/json' \ + -d '{ + "title": "PR: ${{ github.ref_name }} -> main", + "body": "This is an automated PR created by Gitea Actions.", + "base": "main", + "head": "${{ github.ref_name }}" + }' | jq '{index: .number}' > pr_created.json + echo "pr_created=$(jq -c . pr_created.json)" >> "$GITHUB_OUTPUT" # # Job 2: Run SonarQube Analysis # sonarqube-analysis: From c536d7da6c60f1de57463ccb57b064c3d200b3d7 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 15:46:01 -0500 Subject: [PATCH 098/124] Extending to test out Sonar scanning and PR commenting... --- .../workflows/branch-sonarscan-pr-merge.yml | 61 +++++++++++-------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 294230a5..928c3dd5 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -49,34 +49,45 @@ jobs: }' | jq '{index: .number}' > pr_created.json echo "pr_created=$(jq -c . pr_created.json)" >> "$GITHUB_OUTPUT" - # # Job 2: Run SonarQube Analysis - # sonarqube-analysis: - # runs-on: ubuntu-latest - # needs: check-and-create-pr - # outputs: - # quality_gate_status: ${{ steps.quality-gate.outputs.quality-gate-status }} - # steps: - # - name: Checkout Code - # uses: actions/checkout@v4 + # Job 2: Run SonarQube Analysis + sonarqube-analysis: + runs-on: ubuntu-latest + needs: check-and-create-pr + outputs: + quality_gate_status: ${{ steps.quality-gate.outputs.quality-gate-status }} + steps: + - name: Checkout Code + uses: actions/checkout@v4 - # # Step 1: Run SonarQube Scan - # - name: SonarQube Scan - # uses: sonarsource/sonarqube-scan-action@v4.1.0 - # env: - # SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} - # SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + # Step 1: Run SonarQube Scan + - name: SonarQube Scan + uses: sonarsource/sonarqube-scan-action@v4.1.0 + env: + SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - # # Step 2: SonarQube Quality Gate Check - # - name: SonarQube Quality Gate - # id: quality-gate - # uses: sonarsource/sonarqube-quality-gate-action@v1 - # env: - # SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} - # SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + # Step 2: SonarQube Quality Gate Check + - name: SonarQube Quality Gate + id: quality-gate + uses: sonarsource/sonarqube-quality-gate-action@v1 + env: + SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + + - name: Pause for quality gate results + run: sleep 10 - # - name: Log Quality Gate Result - # run: | - # echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" + - name: Check Quality Gate Status + uses: DesarrolloORT/sonarqube-quality-gate-action@v1 + id: quality-gate-check + with: + sonar-host-url: ${{ secrets.SONARQUBE_HOST }} + sonar-token: ${{ secrets.SONARQUBE_TOKEN }} + github-token: ${{ secrets.BOT_GITEA_TOKEN }} + + - name: Log Quality Gate Result + run: | + echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" # # Job 3: Merge PR if Quality Gate passes # merge-pr: From a71740f8de4dbbde0e7380f7e7441193db6daf4b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 15:59:08 -0500 Subject: [PATCH 099/124] Trying a custom as opposed to official Sonar action... --- .../workflows/branch-sonarscan-pr-merge.yml | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 928c3dd5..869c9dc7 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -66,28 +66,40 @@ jobs: SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - # Step 2: SonarQube Quality Gate Check - - name: SonarQube Quality Gate - id: quality-gate - uses: sonarsource/sonarqube-quality-gate-action@v1 + - name: Custom Quality Gate Check + uses: dieuhd/sonar-quality-gate@v1 env: - SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + GITHUB_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }} + GIT_URL: ${{ vars.RINOA_GITEA_URL }}/api/v1 + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} + SONAR_URL: ${{ secrets.SONARQUBE_HOST }} SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - - - name: Pause for quality gate results - run: sleep 10 - - - name: Check Quality Gate Status - uses: DesarrolloORT/sonarqube-quality-gate-action@v1 - id: quality-gate-check with: - sonar-host-url: ${{ secrets.SONARQUBE_HOST }} - sonar-token: ${{ secrets.SONARQUBE_TOKEN }} - github-token: ${{ secrets.BOT_GITEA_TOKEN }} + login: ${{ secrets.SONAR_TOKEN }} + url: ${{ secrets.SONAR_URL }} + projectKey: ${{ secrets.SONAR_PROJECT_KEY }} + # Step 2: SonarQube Quality Gate Check + # - name: SonarQube Quality Gate + # id: quality-gate + # uses: sonarsource/sonarqube-quality-gate-action@v1 + # env: + # SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + # SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + + # - name: Pause for quality gate results + # run: sleep 10 - - name: Log Quality Gate Result - run: | - echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" + # - name: Check Quality Gate Status + # uses: DesarrolloORT/sonarqube-quality-gate-action@v1 + # id: quality-gate-check + # with: + # sonar-host-url: ${{ secrets.SONARQUBE_HOST }} + # sonar-token: ${{ secrets.SONARQUBE_TOKEN }} + # github-token: ${{ secrets.BOT_GITEA_TOKEN }} + + # - name: Log Quality Gate Result + # run: | + # echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" # # Job 3: Merge PR if Quality Gate passes # merge-pr: From 4a13e5e46e4595b2da3ad639ce30dedd1cc00675 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 16:41:59 -0500 Subject: [PATCH 100/124] Trying to trigger gitea-sonarqube-bot for PR comment... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 869c9dc7..e5617e62 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -16,6 +16,7 @@ jobs: outputs: pr_created: ${{ steps.check-pr.outputs.pr_created }} pr_index: ${{ steps.create-pr.outputs.pr_index }} + steps: - name: Checkout Code uses: actions/checkout@v4 @@ -51,10 +52,9 @@ jobs: # Job 2: Run SonarQube Analysis sonarqube-analysis: + name: SonarQube Analysis runs-on: ubuntu-latest needs: check-and-create-pr - outputs: - quality_gate_status: ${{ steps.quality-gate.outputs.quality-gate-status }} steps: - name: Checkout Code uses: actions/checkout@v4 From de8477f09e2d829ea05445dca1b6064adc9c9494 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 18:26:26 -0500 Subject: [PATCH 101/124] Trying to trigger gitea-sonarqube-bot for PR comment... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index e5617e62..78b25512 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -67,17 +67,13 @@ jobs: SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - name: Custom Quality Gate Check - uses: dieuhd/sonar-quality-gate@v1 - env: - GITHUB_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }} - GIT_URL: ${{ vars.RINOA_GITEA_URL }}/api/v1 - GIT_TOKEN: ${{ secrets.GIT_TOKEN }} - SONAR_URL: ${{ secrets.SONARQUBE_HOST }} - SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + uses: phwt/sonarqube-quality-gate-action@v1 + id: quality-gate-check with: - login: ${{ secrets.SONAR_TOKEN }} - url: ${{ secrets.SONAR_URL }} - projectKey: ${{ secrets.SONAR_PROJECT_KEY }} + sonar-project-key: rinoa-docker + sonar-host-url: ${{ secrets.SONARQUBE_HOST }} + sonar-token: ${{ secrets.SONARQUBE_TOKEN }} + github-token: ${{ secrets.BOT_GITEA_TOKEN }} # Step 2: SonarQube Quality Gate Check # - name: SonarQube Quality Gate # id: quality-gate From 968bcb1204c2e2ba7f4575a2c5715cf662bf6b0c Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 20:31:25 -0500 Subject: [PATCH 102/124] Tweaking the Sonarqube scanning. --- .../workflows/branch-sonarscan-pr-merge.yml | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 78b25512..96383b74 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -66,36 +66,21 @@ jobs: SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + - name: SonarQube Quality Gate + id: quality-gate + uses: sonarsource/sonarqube-quality-gate-action@v1.1.0 + env: + SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} + SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + - name: Custom Quality Gate Check - uses: phwt/sonarqube-quality-gate-action@v1 + uses: DesarrolloORT/sonarqube-quality-gate-action@v1.0.1 id: quality-gate-check with: sonar-project-key: rinoa-docker sonar-host-url: ${{ secrets.SONARQUBE_HOST }} sonar-token: ${{ secrets.SONARQUBE_TOKEN }} github-token: ${{ secrets.BOT_GITEA_TOKEN }} - # Step 2: SonarQube Quality Gate Check - # - name: SonarQube Quality Gate - # id: quality-gate - # uses: sonarsource/sonarqube-quality-gate-action@v1 - # env: - # SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} - # SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - - # - name: Pause for quality gate results - # run: sleep 10 - - # - name: Check Quality Gate Status - # uses: DesarrolloORT/sonarqube-quality-gate-action@v1 - # id: quality-gate-check - # with: - # sonar-host-url: ${{ secrets.SONARQUBE_HOST }} - # sonar-token: ${{ secrets.SONARQUBE_TOKEN }} - # github-token: ${{ secrets.BOT_GITEA_TOKEN }} - - # - name: Log Quality Gate Result - # run: | - # echo "Quality Gate Status: ${{ steps.quality-gate.outputs.quality-gate-status }}" # # Job 3: Merge PR if Quality Gate passes # merge-pr: From 6bf1f8d004c90fafc594b56698e315858bd29dc5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 21:16:31 -0500 Subject: [PATCH 103/124] Tweaking the Sonarqube scanning yet again. --- .../workflows/branch-sonarscan-pr-merge.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 96383b74..ed4cfa90 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -80,7 +80,24 @@ jobs: sonar-project-key: rinoa-docker sonar-host-url: ${{ secrets.SONARQUBE_HOST }} sonar-token: ${{ secrets.SONARQUBE_TOKEN }} - github-token: ${{ secrets.BOT_GITEA_TOKEN }} + + - name: Convert JSON report to markdown + id: convert-json-to-md + uses: parkerbxyz/json-to-markdown-table@v1.1.2 + with: + json: ${{ steps.quality-gate-check.outputs.quality-gate-result }} + + # Step 2: Post SonarQube results as comment (using curl commands and Gitea API) + # - name: Post SonarQube Results as Comment + # run: | + # curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.pull_request.number }}/reviews \ + # -X POST \ + # -H 'Accept: application/json' \ + # -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \ + # -H 'Content-Type: application/json' \ + # -d '{ + # "body": "SonarQube analysis results:\n\n- Bugs: ${{ env.SONAR_BUGS }}\n- Vulnerabilities: ${{ env.SONAR_VULNERABILITIES }}\n- Code Smells: ${{ env.SONAR_CODE_SMELLS }}\n- Coverage: ${{ env.SONAR_COVERAGE }}%\n- Duplications: ${{ env.SONAR_DUPLICATIONS }}%\n- Quality Gate Status: ${{ env.SONAR_QUALITY_GATE_STATUS }}" + # }' # # Job 3: Merge PR if Quality Gate passes # merge-pr: From 048eac9d97482c15c16ece320b337691676d8a18 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 21:25:23 -0500 Subject: [PATCH 104/124] Testing out JSON to MD conversion. --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index ed4cfa90..10eb93ce 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -87,6 +87,10 @@ jobs: with: json: ${{ steps.quality-gate-check.outputs.quality-gate-result }} + - name: Verify markdown output + run: | + echo "${{ steps.convert-json-to-md.outputs.table }}" + # Step 2: Post SonarQube results as comment (using curl commands and Gitea API) # - name: Post SonarQube Results as Comment # run: | From 86b3a2b01bb313c97bbeccab7ba7e2f9323777ca Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 21:35:05 -0500 Subject: [PATCH 105/124] Still trying to retrieve report results... --- .../workflows/branch-sonarscan-pr-merge.yml | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 10eb93ce..c52d66a8 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -81,15 +81,20 @@ jobs: sonar-host-url: ${{ secrets.SONARQUBE_HOST }} sonar-token: ${{ secrets.SONARQUBE_TOKEN }} - - name: Convert JSON report to markdown - id: convert-json-to-md - uses: parkerbxyz/json-to-markdown-table@v1.1.2 - with: - json: ${{ steps.quality-gate-check.outputs.quality-gate-result }} - - - name: Verify markdown output + - name: Check Quality Gate Status run: | - echo "${{ steps.convert-json-to-md.outputs.table }}" + echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.quality-gate-status }}" + echo "Quality Gate Result: ${{ steps.quality-gate-check.outputs.quality-gate-result }}" + + # - name: Convert JSON report to markdown + # id: convert-json-to-md + # uses: parkerbxyz/json-to-markdown-table@v1.1.2 + # with: + # json: ${{ steps.quality-gate-check.outputs.quality-gate-result }} + + # - name: Verify markdown output + # run: | + # echo "${{ steps.convert-json-to-md.outputs.table }}" # Step 2: Post SonarQube results as comment (using curl commands and Gitea API) # - name: Post SonarQube Results as Comment From b4f093535712bf5799009bae12089107cdccff80 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 21:42:47 -0500 Subject: [PATCH 106/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index c52d66a8..d9220d9c 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -86,15 +86,15 @@ jobs: echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.quality-gate-status }}" echo "Quality Gate Result: ${{ steps.quality-gate-check.outputs.quality-gate-result }}" - # - name: Convert JSON report to markdown - # id: convert-json-to-md - # uses: parkerbxyz/json-to-markdown-table@v1.1.2 - # with: - # json: ${{ steps.quality-gate-check.outputs.quality-gate-result }} + - name: Convert JSON report to markdown + id: convert-json-to-md + uses: parkerbxyz/json-to-markdown-table@v1.1.2 + with: + json: ${{ toJSON(steps.quality-gate-check.outputs.quality-gate-result) }} - # - name: Verify markdown output - # run: | - # echo "${{ steps.convert-json-to-md.outputs.table }}" + - name: Verify markdown output + run: | + echo "${{ steps.convert-json-to-md.outputs.table }}" # Step 2: Post SonarQube results as comment (using curl commands and Gitea API) # - name: Post SonarQube Results as Comment From 485680aa068b5fb13464bf9bee54d59b3e194d6d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 21:49:29 -0500 Subject: [PATCH 107/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index d9220d9c..21ab11d0 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -84,7 +84,7 @@ jobs: - name: Check Quality Gate Status run: | echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.quality-gate-status }}" - echo "Quality Gate Result: ${{ steps.quality-gate-check.outputs.quality-gate-result }}" + echo "Quality Gate Result: ${{ toJSON(steps.quality-gate-check.outputs.quality-gate-result) }}" - name: Convert JSON report to markdown id: convert-json-to-md From 6952341428d1ec7b07b1e64c2a2fe8ad061c7773 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 21:54:42 -0500 Subject: [PATCH 108/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 21ab11d0..156449bc 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -83,8 +83,9 @@ jobs: - name: Check Quality Gate Status run: | - echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.quality-gate-status }}" - echo "Quality Gate Result: ${{ toJSON(steps.quality-gate-check.outputs.quality-gate-result) }}" + echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.project-status }}" + echo "Quality Gate Result: " + echo ${{ steps.quality-gate-check.outputs.quality-gate-result) }} | jq - name: Convert JSON report to markdown id: convert-json-to-md From 17aab18e2c8e138a761655cffe43aed0d97b7f8b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 21:59:25 -0500 Subject: [PATCH 109/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 156449bc..5c9c12cb 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -85,7 +85,7 @@ jobs: run: | echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.project-status }}" echo "Quality Gate Result: " - echo ${{ steps.quality-gate-check.outputs.quality-gate-result) }} | jq + echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" | jq - name: Convert JSON report to markdown id: convert-json-to-md From 8d480bda8933fa14756cc2dbedb3aba5534bd3c8 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 17 Dec 2024 22:03:58 -0500 Subject: [PATCH 110/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 5c9c12cb..407fcfc8 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -85,13 +85,14 @@ jobs: run: | echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.project-status }}" echo "Quality Gate Result: " - echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" | jq + echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" > quality-gate-result.json + cat quality-gate-result.json | jq - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: ${{ toJSON(steps.quality-gate-check.outputs.quality-gate-result) }} + json: toJSON(${{ steps.quality-gate-check.outputs.quality-gate-result }}) - name: Verify markdown output run: | From 2bf5abc672b81e9d79f5b2e88e6cfbff1c001cc6 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 08:05:26 -0500 Subject: [PATCH 111/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 407fcfc8..a21c3483 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -82,12 +82,16 @@ jobs: sonar-token: ${{ secrets.SONARQUBE_TOKEN }} - name: Check Quality Gate Status + id: check-quality-gate-status run: | echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.project-status }}" echo "Quality Gate Result: " - echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" > quality-gate-result.json - cat quality-gate-result.json | jq - + echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" > quality-gate-result.txt + sed -E 's/([^,{:]*):/\1":/g; s/: ([^,}\]]*)/: "\1"/g' input.txt | sed 's/,\s*}/}/g; s/,\s*\]/]/g' > fixed.json + jq '.' fixed.json + cat fixed.json + echo "quality-gate-report=$(cat fixed.json)" >> "$GITHUB_OUTPUT" + - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 From 7de19ba11f5b34586c96667d87afcbddb7df3d45 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 08:12:10 -0500 Subject: [PATCH 112/124] Var fix, L89-90... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index a21c3483..135c8c68 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -47,7 +47,7 @@ jobs: "body": "This is an automated PR created by Gitea Actions.", "base": "main", "head": "${{ github.ref_name }}" - }' | jq '{index: .number}' > pr_created.json + }' -s | jq '{index: .number}' > pr_created.json echo "pr_created=$(jq -c . pr_created.json)" >> "$GITHUB_OUTPUT" # Job 2: Run SonarQube Analysis @@ -86,7 +86,7 @@ jobs: run: | echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.project-status }}" echo "Quality Gate Result: " - echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" > quality-gate-result.txt + echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" > input.txt sed -E 's/([^,{:]*):/\1":/g; s/: ([^,}\]]*)/: "\1"/g' input.txt | sed 's/,\s*}/}/g; s/,\s*\]/]/g' > fixed.json jq '.' fixed.json cat fixed.json From b254fdf31ddaad044efd73b9f96f8d8b76b74b50 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 08:24:13 -0500 Subject: [PATCH 113/124] JSON formatting fix... --- .../workflows/branch-sonarscan-pr-merge.yml | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 135c8c68..666f7a77 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -47,7 +47,7 @@ jobs: "body": "This is an automated PR created by Gitea Actions.", "base": "main", "head": "${{ github.ref_name }}" - }' -s | jq '{index: .number}' > pr_created.json + }' | jq '{index: .number}' > pr_created.json echo "pr_created=$(jq -c . pr_created.json)" >> "$GITHUB_OUTPUT" # Job 2: Run SonarQube Analysis @@ -80,27 +80,36 @@ jobs: sonar-project-key: rinoa-docker sonar-host-url: ${{ secrets.SONARQUBE_HOST }} sonar-token: ${{ secrets.SONARQUBE_TOKEN }} - - - name: Check Quality Gate Status - id: check-quality-gate-status - run: | - echo "Quality Gate Status: ${{ steps.quality-gate-check.outputs.project-status }}" - echo "Quality Gate Result: " - echo "${{ steps.quality-gate-check.outputs.quality-gate-result }}" > input.txt - sed -E 's/([^,{:]*):/\1":/g; s/: ([^,}\]]*)/: "\1"/g' input.txt | sed 's/,\s*}/}/g; s/,\s*\]/]/g' > fixed.json - jq '.' fixed.json - cat fixed.json - echo "quality-gate-report=$(cat fixed.json)" >> "$GITHUB_OUTPUT" - - - name: Convert JSON report to markdown - id: convert-json-to-md - uses: parkerbxyz/json-to-markdown-table@v1.1.2 - with: - json: toJSON(${{ steps.quality-gate-check.outputs.quality-gate-result }}) - - name: Verify markdown output + - name: Create Input File run: | - echo "${{ steps.convert-json-to-md.outputs.table }}" + echo "Creating invalid input..." + cat < input.txt + ${{ steps.quality-gate-check.outputs.quality-gate-result }} + EOF + + - name: Fix JSON Formatting + id: fix-json + run: | + echo "Fixing invalid JSON..." + sed -E 's/([^,{:]*):/\1":/g; s/: ([^,}\]]*)/: "\1"/g' input.txt | \ + sed 's/,\s*}/}/g; s/,\s*\]/]/g' > fixed.json + cat fixed.json + + - name: Validate Fixed JSON + run: | + echo "Validating JSON with jq..." + jq '.' fixed.json + + # - name: Convert JSON report to markdown + # id: convert-json-to-md + # uses: parkerbxyz/json-to-markdown-table@v1.1.2 + # with: + # json: toJSON(${{ steps.quality-gate-check.outputs.quality-gate-result }}) + + # - name: Verify markdown output + # run: | + # echo "${{ steps.convert-json-to-md.outputs.table }}" # Step 2: Post SonarQube results as comment (using curl commands and Gitea API) # - name: Post SonarQube Results as Comment From f30a96cbb7f9c4e32ed3e6d6faddc443c5e1a431 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 08:33:50 -0500 Subject: [PATCH 114/124] JSON formatting fixes... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 666f7a77..385e4d52 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -84,18 +84,11 @@ jobs: - name: Create Input File run: | echo "Creating invalid input..." - cat < input.txt - ${{ steps.quality-gate-check.outputs.quality-gate-result }} - EOF - - - name: Fix JSON Formatting - id: fix-json - run: | - echo "Fixing invalid JSON..." - sed -E 's/([^,{:]*):/\1":/g; s/: ([^,}\]]*)/: "\1"/g' input.txt | \ - sed 's/,\s*}/}/g; s/,\s*\]/]/g' > fixed.json + echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > input.txt + sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' input.txt > fixed.json + echo "Fixed JSON:" cat fixed.json - + - name: Validate Fixed JSON run: | echo "Validating JSON with jq..." From 7388a33fdc852220fbf0207030a1dabccfe3f99b Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 09:15:44 -0500 Subject: [PATCH 115/124] Still trying to retrieve report results in Markdown... --- .../workflows/branch-sonarscan-pr-merge.yml | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 385e4d52..a23b248d 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -81,28 +81,23 @@ jobs: sonar-host-url: ${{ secrets.SONARQUBE_HOST }} sonar-token: ${{ secrets.SONARQUBE_TOKEN }} - - name: Create Input File + - name: JSON clean-up for proccessing... + id: json-cleanup run: | - echo "Creating invalid input..." + echo "Cleaning up quality gate response..." echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > input.txt sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' input.txt > fixed.json - echo "Fixed JSON:" - cat fixed.json - - - name: Validate Fixed JSON + echo "fixed-json=$(cat fixed.json)" >> $GITHUB_OUTPUT + + - name: Convert JSON report to markdown + id: convert-json-to-md + uses: parkerbxyz/json-to-markdown-table@v1.1.2 + with: + json: toJSON(${{ steps.json-cleanup.outputs }}) + + - name: Verify markdown output run: | - echo "Validating JSON with jq..." - jq '.' fixed.json - - # - name: Convert JSON report to markdown - # id: convert-json-to-md - # uses: parkerbxyz/json-to-markdown-table@v1.1.2 - # with: - # json: toJSON(${{ steps.quality-gate-check.outputs.quality-gate-result }}) - - # - name: Verify markdown output - # run: | - # echo "${{ steps.convert-json-to-md.outputs.table }}" + echo "${{ steps.convert-json-to-md.outputs.table }}" # Step 2: Post SonarQube results as comment (using curl commands and Gitea API) # - name: Post SonarQube Results as Comment From c87de397ac5cda44de9726548d2fe000997c6922 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 09:21:57 -0500 Subject: [PATCH 116/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index a23b248d..27066ee2 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -93,7 +93,7 @@ jobs: id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: toJSON(${{ steps.json-cleanup.outputs }}) + json: ${{ toJSON(steps.json-cleanup.outputs) }} - name: Verify markdown output run: | From 64e4f49b8b255024031f6e9d1e1ebb890d529135 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 09:30:24 -0500 Subject: [PATCH 117/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 27066ee2..02018d63 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -88,12 +88,13 @@ jobs: echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > input.txt sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' input.txt > fixed.json echo "fixed-json=$(cat fixed.json)" >> $GITHUB_OUTPUT + cat fixed.json | jq - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: ${{ toJSON(steps.json-cleanup.outputs) }} + json: '${{ toJSON(steps.json-cleanup.outputs) }}' - name: Verify markdown output run: | From 8670a81aef5c2a988a016e0d82d7d3090a724e94 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 09:35:00 -0500 Subject: [PATCH 118/124] Possible fix, L97 --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 02018d63..a2b79d65 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -94,7 +94,7 @@ jobs: id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: '${{ toJSON(steps.json-cleanup.outputs) }}' + json: '${{ toJSON(steps.json-cleanup.outputs.fixed-json) }}' - name: Verify markdown output run: | From 4e341ee4381505f930be343fc52cb61738714bae Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 09:45:17 -0500 Subject: [PATCH 119/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index a2b79d65..27a0e902 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -86,19 +86,19 @@ jobs: run: | echo "Cleaning up quality gate response..." echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > input.txt - sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' input.txt > fixed.json + sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' input.txt > raw.json + fixed_json=$(jq -c '.' raw.json) echo "fixed-json=$(cat fixed.json)" >> $GITHUB_OUTPUT - cat fixed.json | jq - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: '${{ toJSON(steps.json-cleanup.outputs.fixed-json) }}' + json: ${{ steps.json-cleanup.outputs.fixed-json }} - name: Verify markdown output run: | - echo "${{ steps.convert-json-to-md.outputs.table }}" + echo ${{ steps.convert-json-to-md.outputs.table }} # Step 2: Post SonarQube results as comment (using curl commands and Gitea API) # - name: Post SonarQube Results as Comment From 8da9d47d866a192926f241b3976fe1ada40eb98a Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 09:59:09 -0500 Subject: [PATCH 120/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 27a0e902..57c58fba 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -88,13 +88,13 @@ jobs: echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > input.txt sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' input.txt > raw.json fixed_json=$(jq -c '.' raw.json) - echo "fixed-json=$(cat fixed.json)" >> $GITHUB_OUTPUT + echo "fixed_json=$(cat fixed_json)" >> $GITHUB_OUTPUT - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: ${{ steps.json-cleanup.outputs.fixed-json }} + json: ${{ steps.json-cleanup.outputs.fixed_json }} - name: Verify markdown output run: | From 2c6e71abf0f351a2af5dc6ca9153bbd13bb057ef Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 10:05:59 -0500 Subject: [PATCH 121/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 57c58fba..1b5f41b2 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -85,16 +85,16 @@ jobs: id: json-cleanup run: | echo "Cleaning up quality gate response..." - echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > input.txt - sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' input.txt > raw.json - fixed_json=$(jq -c '.' raw.json) - echo "fixed_json=$(cat fixed_json)" >> $GITHUB_OUTPUT + echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt + sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json + qg_fixed_json=$(jq -c '.' qg_raw.json) + echo "fixed-json=$(echo $qg_fixed_json)" >> $GITHUB_OUTPUT - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: ${{ steps.json-cleanup.outputs.fixed_json }} + json: ${{ steps.json-cleanup.outputs.fixed-json }} - name: Verify markdown output run: | From 6b24ca1a912a3e7e63b74dce32207582507eaf73 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 10:13:21 -0500 Subject: [PATCH 122/124] Still trying to retrieve report results in Markdown... --- .../workflows/branch-sonarscan-pr-merge.yml | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 1b5f41b2..81bcca4c 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -87,14 +87,29 @@ jobs: echo "Cleaning up quality gate response..." echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json - qg_fixed_json=$(jq -c '.' qg_raw.json) - echo "fixed-json=$(echo $qg_fixed_json)" >> $GITHUB_OUTPUT + jq -c '.' qg_raw.json > qg_fixed_json + cat qg_fixed_json + echo "qg_fixed_json=$(cat qg_fixed_json)" >> $GITHUB_OUTPUT - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: ${{ steps.json-cleanup.outputs.fixed-json }} + json: ${{ steps.json-cleanup.outputs.qg_fixed_json }} + table_title: SonarQube Quality Gate Results + table_columns: metric,value + table_column_alignment: left,right + table_cell_padding: 1 + table_cell_padding_left: 2 + table_cell_padding_right: 2 + table_cell_padding_top: 1 + table_cell_padding_bottom: 1 + table_cell_border: true + table_cell_border_color: '#000000' + table_cell_border_width: 1 + table_cell_border_style: solid + table_cell_border_radius: 0 + table_cell_border_radius_top_left: 0 - name: Verify markdown output run: | From 0cc232f2985c0622f5c2f801808d9e1f1f750371 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 10:30:03 -0500 Subject: [PATCH 123/124] Still trying to retrieve report results in Markdown... --- .../workflows/branch-sonarscan-pr-merge.yml | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 81bcca4c..7d1e2e62 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -87,29 +87,14 @@ jobs: echo "Cleaning up quality gate response..." echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json - jq -c '.' qg_raw.json > qg_fixed_json - cat qg_fixed_json - echo "qg_fixed_json=$(cat qg_fixed_json)" >> $GITHUB_OUTPUT + jq -c '.' qg_raw.json > qg_fixed_json.json + echo "qg_fixed_json=$(cat qg_fixed_json.json)" >> $GITHUB_ENV - name: Convert JSON report to markdown id: convert-json-to-md uses: parkerbxyz/json-to-markdown-table@v1.1.2 with: - json: ${{ steps.json-cleanup.outputs.qg_fixed_json }} - table_title: SonarQube Quality Gate Results - table_columns: metric,value - table_column_alignment: left,right - table_cell_padding: 1 - table_cell_padding_left: 2 - table_cell_padding_right: 2 - table_cell_padding_top: 1 - table_cell_padding_bottom: 1 - table_cell_border: true - table_cell_border_color: '#000000' - table_cell_border_width: 1 - table_cell_border_style: solid - table_cell_border_radius: 0 - table_cell_border_radius_top_left: 0 + json: ${{ env.qg_fixed_json }} - name: Verify markdown output run: | From a7e08fcf6722aade92ece2ff0af12dbb5afe9398 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 18 Dec 2024 10:36:24 -0500 Subject: [PATCH 124/124] Still trying to retrieve report results in Markdown... --- .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml index 7d1e2e62..ca19fc2d 100644 --- a/.gitea/workflows/branch-sonarscan-pr-merge.yml +++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml @@ -88,6 +88,7 @@ jobs: echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json jq -c '.' qg_raw.json > qg_fixed_json.json + cat qg_fixed_json.json echo "qg_fixed_json=$(cat qg_fixed_json.json)" >> $GITHUB_ENV - name: Convert JSON report to markdown