From 39896a95eb8778667f6666b98755db0ae0498358 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Tue, 28 Feb 2023 17:19:05 +0000
Subject: [PATCH] Switch to reusable CI

---
 .github/workflows-disabled/merge-to-main.yml | 34 -------------------
 .github/workflows/ci.yml                     | 35 ++------------------
 2 files changed, 3 insertions(+), 66 deletions(-)
 delete mode 100644 .github/workflows-disabled/merge-to-main.yml

diff --git a/.github/workflows-disabled/merge-to-main.yml b/.github/workflows-disabled/merge-to-main.yml
deleted file mode 100644
index c21b5a8..0000000
--- a/.github/workflows-disabled/merge-to-main.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Merge to main
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-      - name: Install dependencies
-        run: pip install -r requirements.txt && pip install -r requirements-dev.txt
-      - name: Lint
-        run: pylint --recursive=yes --output-format=parseable --output=lintreport.txt .
-      - name: Unit Test
-        run: |
-          coverage run -m py.test -v
-          coverage xml
-      - uses: sonarsource/sonarqube-scan-action@master
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-      - uses: sonarsource/sonarqube-quality-gate-action@master
-        timeout-minutes: 5
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5666f28..bfea3be 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,35 +13,6 @@ on:
 
 jobs:
   ci:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-      - name: Install dependencies
-        run: pip install -r requirements.txt && pip install -r requirements-dev.txt
-      - name: Lint
-        run: pylint --recursive=yes --output-format=parseable --output=lintreport.txt . || pylint-exit $?
-      - name: Unit Test
-        run: |
-          coverage run -m py.test -v --junitxml=testresults.xml
-          coverage xml
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_CLOUD }}
-      # - uses: sonarsource/sonarqube-scan-action@master
-      #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      #     SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-      # - uses: sonarsource/sonarqube-quality-gate-action@master
-      #   timeout-minutes: 5
-      #   env:
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    uses: luketainton/gha-workflows/.github/workflows/ci-python.yml@main
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}