diff --git a/.github/workflows-disabled/merge-to-main.yml b/.github/workflows-disabled/merge-to-main.yml deleted file mode 100644 index 7348d65..0000000 --- a/.github/workflows-disabled/merge-to-main.yml +++ /dev/null @@ -1,35 +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 . - continue-on-error: true - - 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 898a236..bfea3be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,29 +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 $? - continue-on-error: true - - name: Unit Test - run: | - coverage run -m pytest -v --junitxml=testresults.xml - coverage xml - sed -i 's/\/home\/runner\/work\/epage\/epage/\/github\/workspace/g' coverage.xml - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_CLOUD }} + uses: luketainton/gha-workflows/.github/workflows/ci-python.yml@main + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}