From 072d4898fb1f4b3826d8edc9cb3bc8639a76d7f1 Mon Sep 17 00:00:00 2001 From: Alex Ioannidis Date: Thu, 13 Feb 2025 19:58:26 +0100 Subject: [PATCH] ci: use reusable workflows --- .github/workflows/pypi-publish.yml | 26 ++------------- .github/workflows/tests.yml | 53 ++++++++---------------------- 2 files changed, 15 insertions(+), 64 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index fe99541..afa19f9 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -16,27 +16,5 @@ on: jobs: Publish: - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.7 - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install setuptools wheel babel - - - name: Build package - run: | - python setup.py sdist bdist_wheel - - - name: Publish on PyPI - uses: pypa/gh-action-pypi-publish@v1.3.1 - with: - user: __token__ - password: ${{ secrets.pypi_token }} + uses: inveniosoftware/workflows/.github/workflows/pypi-publish.yml@master + secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a41e12..842aeec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,14 +8,19 @@ # it under the terms of the Revised BSD License; see LICENSE file for # more details. - name: CI on: push: - branches: master + branches: + - master + - "feature/*" + - "maint-**" pull_request: - branches: master + branches: + - master + - "maint-**" + - "feature/**" schedule: # * is a special character in YAML so you have to quote this string - cron: '0 3 * * 6' @@ -28,40 +33,8 @@ on: jobs: Tests: - runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: [3.7, 3.8, 3.9] - requirements-level: [pypi] - - env: - EXTRAS: tests - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - - name: Generate dependencies - run: | - pip install wheel requirements-builder - requirements-builder -e "$EXTRAS" --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt - - - name: Cache pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('.${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt') }} - - - name: Install dependencies - run: | - pip install -r .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt - pip install .[$EXTRAS] - pip freeze - - - name: Run tests - run: | - ./run-tests.sh + uses: inveniosoftware/workflows/.github/workflows/tests-python.yml@master + with: + extras: "tests" + search-service: '[""]' + db-service: '[""]'