diff --git a/.github/workflows/publish-development.yml b/.github/workflows/publish-development.yml index b9eb9c4..1df3d15 100644 --- a/.github/workflows/publish-development.yml +++ b/.github/workflows/publish-development.yml @@ -12,7 +12,7 @@ on: jobs: build: - uses: ./github/workflows/templates/build.yml + uses: ./github/workflows/build.yml publish-to-test-pypi: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-production.yml b/.github/workflows/publish-production.yml index 63e96e4..c069025 100644 --- a/.github/workflows/publish-production.yml +++ b/.github/workflows/publish-production.yml @@ -9,7 +9,7 @@ on: jobs: build: - uses: ./github/workflows/templates/build.yml + uses: ./github/workflows/build.yml publish-to-test-pypi: runs-on: ubuntu-latest diff --git a/.github/workflows/templates/build.yml b/.github/workflows/templates/build.yml deleted file mode 100644 index 74b95a4..0000000 --- a/.github/workflows/templates/build.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Build PyPI - -jobs: - linting: - runs-on: ubuntu-latest - steps: - - name: Reuse linting job - uses: ./github/workflows/templates/linting.yml - - build: - needs: linting - runs-on: ubuntu-latest - # Specifying a GitHub environment is optional, but strongly encouraged - #environment: production - steps: - - name: Check out source repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 #full history - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Install dependencies - run: | - pip install hatch - - name: Build project - run: hatch build diff --git a/.github/workflows/templates/linting.yml b/.github/workflows/templates/linting.yml deleted file mode 100644 index 141198a..0000000 --- a/.github/workflows/templates/linting.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Linting (black and flake8) - -jobs: - linting: - runs-on: ubuntu-latest - steps: - - name: Check out source repository - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Install pip package(s) - run: pip install hatch - - name: Run black formatter check - run: hatch run lint:black --check --verbose src tests - - name: Run flake8 linter - run: hatch run lint:flake8 - - name: Run unit and integrations tests - run: hatch run test:pytest --cov=openapi-to-asciidoc --cov-report=xml --cov-report=html