Use Reusable GH action

gisktzh · Sep 2, 2024 · 801bb43 · 801bb43
1 parent 4b94aaf
commit 801bb43
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 47 deletions.
diff --git a/.github/workflows/docker-dry-run.yml b/.github/workflows/docker-dry-run.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,18 +10,32 @@ on:
       - main
       - develop
 
+env:
+  coverage_cache_key: python-coverage-report-${{ github.sha }}-${{ github.run_id }}
+
 jobs:
   python:
     name: Python
     uses: ./.github/workflows/python-tests.yml
 
   docker:
     name: Docker
-    uses: ./.github/workflows/docker-dry-run.yml
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gisktzh/github-actions/docker-dry-run@main
+        with:
+          image: gb3-search-api
 
   sonarcloud:
     name: SonarCloud
-    uses: ./.github/workflows/sonar-analysis.yml
     needs: python
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gisktzh/github-actions/sonarcloud-analysis@main
+        with:
+          sonar_token: ${{ secrets.SONAR_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          coverage_file_path: coverage.xml
+          coverage_cache_key: ${{ needs.python.outputs.cache_key }}
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -27,4 +27,6 @@ jobs:
         uses: actions/cache@v4
         with:
           path: coverage.xml
-          key: python-coverage-report-${{ github.sha }}-${{ github.run_id }}
+          key: python-coverage-report-${{ github.sha }}-${{ github.run_id }}
+    outputs:
+      cache_key: python-coverage-report-${{ github.sha }}-${{ github.run_id }}
diff --git a/.github/workflows/sonar-analysis.yml b/.github/workflows/sonar-analysis.yml