Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/merge-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
- develop

jobs:

coverage:
runs-on: ubuntu-latest
if: github.repository == 'NHSDigital/nhs-aws-helpers' && !contains(github.event.head_commit.message, 'tag release version:')
Expand All @@ -16,7 +15,7 @@ jobs:
fetch-depth: 0

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

Expand Down Expand Up @@ -92,7 +91,6 @@ jobs:
if: success() || failure()
run: make down


publish:
runs-on: ubuntu-latest
if: github.repository == 'NHSDigital/nhs-aws-helpers' && github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, 'tag release version:')
Expand All @@ -108,7 +106,7 @@ jobs:
find . -type f | xargs chmod g+w

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

Expand Down Expand Up @@ -165,4 +163,4 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./dist/${{ env.SDIST }}
asset_name: ${{ env.SDIST }}
asset_content_type: application/gzip
asset_content_type: application/gzip
8 changes: 4 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
PR_BRANCH: ${{ github.head_ref }}

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
PR_BRANCH: ${{ github.head_ref }}

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
PR_BRANCH: ${{ github.head_ref }}

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

Expand Down Expand Up @@ -307,7 +307,7 @@ jobs:
PR_BRANCH: ${{ github.head_ref }}

- name: setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version-file: "pyproject.toml"

Expand Down
Loading
Loading