update the test-on-pr and matrix-test CI files

diffpy · Dec 9, 2024 · c280931 · c280931
1 parent 7f264d2
commit c280931
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 93 deletions.
diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml
@@ -11,52 +11,11 @@ on:
   workflow_dispatch:
 
 jobs:
-  coverage:
-    defaults:
-      run:
-        shell: bash -l {0}
-
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-        python-version: ["3.11", "3.12", "3.13"]
-    env:
-          LATEST_PYTHON_VERSION: "3.13"
-    steps:
-      - name: Check out diffpy.labpdfproc
-        uses: actions/checkout@v4
-
-      - name: Initialize miniconda
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: test
-          auto-update-conda: true
-          environment-file: environment.yml
-          auto-activate-base: false
-          python-version: ${{ matrix.python-version }}
-
-      - name: Conda config
-        run: >-
-          conda config --set always_yes yes
-          --set changeps1 no
-
-      - name: Install diffpy.labpdfproc and requirements
-        run: |
-          conda install --file requirements/test.txt
-          conda install --file requirements/conda.txt
-          pip install gooey
-          python -m pip install . --no-deps
-
-      - name: Validate diffpy.labpdfproc
-        run: |
-          pytest --cov
-          coverage report -m
-          codecov
-
-      - name: Upload coverage to Codecov
-        if: matrix.os == 'ubuntu-latest' && matrix.python-version == env.LATEST_PYTHON_VERSION
-        uses: codecov/codecov-action@v4
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  matrix-coverage:
+    uses: Billingegroup/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0
+    with:
+      project: diffpy.labpdfproc
+      c_extension: false
+      headless: false
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml
@@ -8,47 +8,11 @@ on:
   workflow_dispatch:
 
 jobs:
-  validate:
-    defaults:
-      run:
-        shell: bash -l {0}
-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out diffpy.labpdfproc repository
-        uses: actions/checkout@v4
-
-      - name: Initialize miniconda
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: test
-          auto-update-conda: true
-          environment-file: environment.yml
-          auto-activate-base: false
-          python-version: 3.13
-
-      - name: Conda config
-        run: >-
-          conda config --set always_yes yes
-          --set changeps1 no
-
-      - name: Install diffpy.labpdfproc and requirements
-        run: |
-          conda install --file requirements/test.txt
-          conda install --file requirements/conda.txt
-          pip install gooey
-          python -m pip install . --no-deps
-
-
-      - name: Validate diffpy.labpdfproc
-        run: |
-          pytest --cov
-          coverage report -m
-          codecov
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
-        with:
-          verbose: true
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
+  tests-on-pr:
+    uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0
+    with:
+      project: diffpy.labpdfproc
+      c_extension: false
+      headless: false
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}