.gitea/workflows/ci.yml

@@ -8,31 +8,15 @@ on:
       - reopened
 
 jobs:
+  validate_pr_title:
+    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/conventional-commit.yml@main
+    with:
+      commit_message: ${{ gitea.event.pull_request.title }}
+
   ci:
-    runs-on: ubuntu-latest
+    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/ci-docker.yml@main
-    steps:
+    with:
-      - name: Check out repository code
+      python-version: 3.13
-        uses: actions/checkout@v4.2.2
+    secrets:
-        with:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          fetch-depth: 0
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-
-      - uses: hadolint/hadolint-action@v3.1.0
-        with:
-          dockerfile: Dockerfile
-          output-file: hadolint.out
-          format: sonarqube
-          no-fail: true
-
-      - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@v4.2.1
-        env:
-          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
-          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
-
-      - name: Snyk Vulnerability Scan
-        uses: snyk/actions/python@master
-        continue-on-error: true # Sometimes vulns aren't immediately fixable
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          args: test --all-projects

.gitea/workflows/conventional_commit.yml

@@ -1,16 +0,0 @@
-name: Validate PR Title
-on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - synchronize
-      - reopened
-
-jobs:
-  validate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: https://git.tainton.uk/actions/conventional-commits-check-action@v1.2.4
-        with:
-          commit-message: ${{ gitea.event.pull_request.title }}

.gitea/workflows/release.yml

@@ -7,13 +7,18 @@ on:
       - main
 
 jobs:
-  # test:
+  test:
-  #   name: Test
+    name: Test
-  #   uses: ./.gitea/workflows/ci.yml@main
+    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/ci-docker.yml@main
+    with:
+      python-version: 3.13
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
 
   create_release:
     name: Create Release
-    # needs: test
+    needs: test
     uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release.yml@main
     secrets:
       ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
@@ -24,7 +29,7 @@ jobs:
     needs: create_release
     steps:
       - run: echo "Created release ${{ needs.create_release.outputs.release_name }}."
-
+  
   publish:
     name: Publish Docker Images
     runs-on: ubuntu-latest

sonar-project.properties

@@ -1,5 +1,7 @@
-sonar.projectKey=docker-dnsmasq
+sonar.organization=luketainton
+sonar.projectKey=luketainton_docker-dnsmasq
 sonar.projectName=docker-dnsmasq
+sonar.projectVersion=1.0
 sonar.docker.hadolint.reportPaths=hadolint.out
 sonar.sources=Dockerfile
-sonar.exclusions=.archive/**,.gitea/**,config/**,.gitignore,README.md,renovate.json,docker-compose.yml
+sonar.exclusions=,.github/**,.gitignore,CODEOWNERS,CHANGELOG.md,LICENSE.md,README.md,renovate.json